Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make alpaka REUSE compliant #2177

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https://www.hzdr.de>
Copy link
Member

@psychocoderHPC psychocoderHPC Oct 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In germany a company can not have the copyright, this is different from other countries.

Kann ein Unternehmen ein Urheberrecht haben?
Nein, ein Urheberrecht für Unternehmen gibt es in Deutschland – 
im Gegensatz etwa zum US-amerikanischen Recht als  
„work made for hire“ – nicht. 
Urheber eines Werkes ist in Deutschland immer die natürliche Person, 
die das Werk geschaffen hat, niemals aber eine “Firma”. [...]

https://www.res-media.net/faq-zum-urheberrecht-fuer-unternehmen/

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but maybe copyright != Urheberrecht

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK I think copyright is Urheberrecht. So the record you added is fine from the technical point of view but I do not think we should apply these changes. Because if we would like to change the license of the project we need the OK from the legal departments of the institutions where we currently need the OK from the contributors.

# SPDX-License-Identifier: CC0-1.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CC0-1.0 is essentially the public domain.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think it's necessary to also put these utility files under a license? I imagine their reusability severly limited.

---
# General options
Language: Cpp
Expand Down
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https://www.hzdr.de>
# SPDX-FileContributor: Benjamin Worpitz <[email protected]>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benjamin contributed under the affiliation of HZDR and TUD, later partly as a pure open-source developer or LogMeIn employee, I do not know exactly.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only contributed for TUD, HZDR and as open-source developer. I did not contribute in the name of any other companies ;-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were HZDR and TU Dresden in parallel? Also do you remember when you left HZDR? Until now I used 2017-12-31 as the cutoff between "HZDR" and "not HZDR" because that is when I joined and I don't remember you ;-)

Copy link
Member

@BenjaminW3 BenjaminW3 Oct 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were HZDR and TU Dresden in parallel?

TUD and HZDR were likely in parallel.

Also do you remember when you left HZDR?

Officially this should have been 2015-09-31

# SPDX-License-Identifier: MPL-2.0

.git
26 changes: 23 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https://www.hzdr.de>
# SPDX-FileCopyrightText: Organisation européenne pour la recherche nucléaire (CERN) <https://www.cern.ch>
# SPDX-FileCopyrightText: Axel Hübl <[email protected]>
# SPDX-FileCopyrightText: Benjamin Worpitz <[email protected]>
#
# Copyright 2023 Benjamin Worpitz, René Widera, Bernhard Manfred Gruber, Jan Stephan, Simeon Ehrig
# SPDX-License-Identifier: MPL-2.0
# SPDX-FileContributor: Antonio Di Pilato <[email protected]>
# SPDX-FileContributor: Simeon Ehrig <[email protected]>
# SPDX-FileContributor: Bernhard Manfred Gruber <[email protected]>
# SPDX-FileContributor: Axel Hübl <[email protected]>
# SPDX-FileContributor: Jeffrey Kelling <[email protected]>
# SPDX-FileContributor: Jan Stephan <[email protected]>
# SPDX-FileContributor: René Widera <[email protected]>
# SPDX-FileContributor: Benjamin Worpitz <[email protected]>
#
# SPDX-License-Identifier: MPL-2.0

name: Continuous Integration

Expand Down Expand Up @@ -94,8 +105,17 @@ jobs:
name: format.patch
path: format.patch

reuse:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: REUSE compliance check
uses: fsfe/reuse-action@v2
with:
args: --suppress-deprecation lint

ci:
needs: clang-format
needs: [clang-format, reuse]
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
env: ${{ matrix.env }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# SPDX-FileCopyrightText: Organisation européenne pour la recherche nucléaire (CERN) <https://www.cern.ch>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# SPDX-FileCopyrightText: Organisation européenne pour la recherche nucléaire (CERN) <https://www.cern.ch>
# SPDX-FileCopyrightText: CERN

I think CERN is enough here. See also: https://indico.cern.ch/category/4251/attachments/101/505/OSL-2012-01-Open_Source_Licences_at_CERN-Short_version.pdf

# SPDX-FileCopyrightText: Benjamin Worpitz <[email protected]>
#
# SPDX-FileContributor: Bernhard Manfred Gruber <[email protected]>
# SPDX-FileContributor: Benjamin Worpitz <[email protected]>
#
# SPDX-License-Identifier: MPL-2.0

name: Publish documentation to gh-pages
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/single-header.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Copyright 2023 Bernhard Manfred Gruber
# SPDX-FileCopyrightText: Organisation européenne pour la recherche nucléaire (CERN) <https://www.cern.ch>
#
# SPDX-FileContributor: Bernhard Manfred Gruber <[email protected]>
#
# SPDX-License-Identifier: MPL-2.0

name: Publish amalgamated alpaka.hpp to single-header
Expand Down
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https://www.hzdr.de>
# SPDX-FileCopyrightText: Organisation européenne pour la recherche nucléaire (CERN) <https://www.cern.ch>
# SPDX-FileCopyrightText: Axel Hübl <[email protected]>
# SPDX-FileCopyrightText: Matthias Werner <[email protected]>
#
# SPDX-FileContributor: Simeon Ehrig <[email protected]>
# SPDX-FileContributor: Bernhard Manfred Gruber <[email protected]>
# SPDX-FileContributor: Axel Hübl <[email protected]>
# SPDX-FileContributor: Jakob Krude <[email protected]>
# SPDX-FileContributor: Alexander Matthes <[email protected]>
# SPDX-FileContributor: Jan Stephan <[email protected]>
# SPDX-FileContributor: Jiří Vyskočil <[email protected]>
# SPDX-FileContributor: Matthias Werner <[email protected]>
# SPDX-FileContributor: René Widera <[email protected]>
# SPDX-FileContributor: Benjamin Worpitz <[email protected]>
#
# SPDX-License-Identifier: MPL-2.0

/docs/doxygen/*
Expand Down
8 changes: 8 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https://www.hzdr.de>
# SPDX-FileCopyrightText: Organisation européenne pour la recherche nucléaire (CERN) <https://www.cern.ch>
#
# SPDX-FileContributor: Simeon Ehrig <[email protected]>
# SPDX-FileContributor: Bernhard Manfred Gruber <[email protected]>
# SPDX-FileContributor: Jeffrey Kelling <[email protected]>
# SPDX-FileContributor: René Widera <[email protected]>
#
# SPDX-License-Identifier: MPL-2.0

# stage description
Expand Down
8 changes: 8 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https://www.hzdr.de>
# SPDX-FileCopyrightText: Matthias Werner <[email protected]>
#
# SPDX-FileContributor: Simeon Ehrig <[email protected]>
# SPDX-FileContributor: Alexander Matthes <[email protected]>
# SPDX-FileContributor: Matthias Werner <[email protected]>
# SPDX-FileContributor: Benjamin Worpitz <[email protected]>
#
# SPDX-License-Identifier: MPL-2.0

version: 2
Expand Down
24 changes: 24 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: alpaka
Upstream-Contact: Jan Stephan <[email protected]>
Copy link
Member Author

@j-stephan j-stephan Sep 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be someone else or a more general e-mail address.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uwe told me, that is not possible. We cannot create E-Mail addresses for organizations or projects.

Source: https://www.github.com/alpaka-group/alpaka

Files: .zenodo.json
Copyright: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https:/www.hzdr.de>
License: CC0-1.0

Files: *.md
Copyright: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https:/www.hzdr.de>
License: CC-BY-4.0

Files: docs/*
Copyright: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https:/www.hzdr.de>
License: CC-BY-4.0

Files: thirdParty/catch2/*
Copyright: Catch2 Authors
License: BSL-1.0

Files: script/job_generator/requirements.txt
Copyright: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https:/www.hzdr.de>
License: MPL-2.0
19 changes: 16 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf e.V. <https://www.hzdr.de>
# SPDX-FileCopyrightText: Organisation européenne pour la recherche nucléaire (CERN) <https://www.cern.ch>
# SPDX-FileCopyrightText: Science and Technology Facilities Council <stfc.ukri.org>
# SPDX-FileCopyrightText: Matthias Werner <[email protected]>
# SPDX-FileCopyrightText: Benjamin Worpitz <[email protected]>
#
# Copyright 2023 Benjamin Worpitz, Jan Stephan, Bernhard Manfred Gruber
# SPDX-License-Identifier: MPL-2.0
# SPDX-FileContributor: Simeon Ehrig <[email protected]>
# SPDX-FileContributor: Bernhard Manfred Gruber <[email protected]>
# SPDX-FileContributor: Axel Hübl <[email protected]>
# SPDX-FileContributor: Stewart Martin-Haugh <[email protected]>
# SPDX-FileContributor: Jan Stephan <[email protected]>
# SPDX-FileContributor: Matthias Werner <[email protected]>
# SPDX-FileContributor: René Widera <[email protected]>
# SPDX-FileContributor: Benjamin Worpitz <[email protected]>
#
# SPDX-License-Identifier: MPL-2.0

################################################################################
# Required CMake version
Expand Down Expand Up @@ -113,7 +125,8 @@ append_recursive_files_add_to_src_group("${_alpaka_ROOT_DIR}/docs/markdown" "${_
set_source_files_properties(${_alpaka_FILES_DOC} PROPERTIES HEADER_FILE_ONLY TRUE)

append_recursive_files_add_to_src_group("${_alpaka_ROOT_DIR}/.github" "${_alpaka_ROOT_DIR}" "yml" _alpaka_FILES_OTHER)
list(APPEND _alpaka_FILES_OTHER "${_alpaka_ROOT_DIR}/.clang-format" "${_alpaka_ROOT_DIR}/.gitignore" "${_alpaka_ROOT_DIR}/.zenodo.json" "${_alpaka_ROOT_DIR}/LICENSE" "${_alpaka_ROOT_DIR}/README.md")
append_recursive_files_add_to_src_group("${_alpaka_ROOT_DIR}/LICENSES" "${_alpaka_ROOT_DIR}" "txt" _alpaka_FILES_OTHER)
list(APPEND _alpaka_FILES_OTHER "${_alpaka_ROOT_DIR}/.clang-format" "${_alpaka_ROOT_DIR}/.gitignore" "${_alpaka_ROOT_DIR}/.zenodo.json" "${_alpaka_ROOT_DIR}/README.md")
set_source_files_properties(${_alpaka_FILES_OTHER} PROPERTIES HEADER_FILE_ONLY TRUE)

if(TARGET alpaka)
Expand Down
10 changes: 10 additions & 0 deletions LICENSES/BSD-2-Clause.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Copyright (c) 2009-present, Homebrew contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12 changes: 12 additions & 0 deletions LICENSES/BSD-3-Clause.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Copyright (c) 2011, 2013 Mutsuo Saito, Makoto Matsumoto, Hiroshima University and The University of Tokyo.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7 changes: 7 additions & 0 deletions LICENSES/BSL-1.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Boost Software License - Version 1.0 - August 17th, 2003

Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following:

The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Loading