Skip to content

Commit 03231bb

Browse files
ssheoreyssheorey
authored
Replace license text with SPDX identifier. (#5868)
* Update copyright year to 2023. * Replace full license text header with SPDX license identifier * Add icon to app * Do not access gcloud for forks.
1 parent dd69a8f commit 03231bb

File tree

1,676 files changed

+3350
-34671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,676 files changed

+3350
-34671
lines changed

‎.github/workflows/documentation.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,6 @@ jobs:
5959
uses: actions/setup-python@v4
6060
with:
6161
python-version: '3.7'
62-
- name: GCloud CLI auth
63-
uses: 'google-github-actions/auth@v1'
64-
with:
65-
project_id: ${{ secrets.GCE_PROJECT }}
66-
credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
67-
- name: GCloud CLI setup
68-
uses: google-github-actions/setup-gcloud@v1
69-
with:
70-
version: ${{ env.GCE_CLI_GHA_VERSION }}
71-
project_id: ${{ secrets.GCE_PROJECT }}
7262

7363
- name: Install dependencies
7464
env:
@@ -97,6 +87,19 @@ jobs:
9787
path: docs/_out/html
9888
if-no-files-found: error
9989

90+
- name: GCloud CLI auth
91+
if: ${{ github.ref == 'refs/heads/master' }}
92+
uses: 'google-github-actions/auth@v1'
93+
with:
94+
project_id: ${{ secrets.GCE_PROJECT }}
95+
credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
96+
- name: GCloud CLI setup
97+
if: ${{ github.ref == 'refs/heads/master' }}
98+
uses: google-github-actions/setup-gcloud@v1
99+
with:
100+
version: ${{ env.GCE_CLI_GHA_VERSION }}
101+
project_id: ${{ secrets.GCE_PROJECT }}
102+
100103
- name: Deploy docs
101104
if: ${{ github.ref == 'refs/heads/master' }}
102105
run: |

‎.github/workflows/ubuntu-openblas.yml

+3-14
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,10 @@ jobs:
2929
source util/ci_utils.sh
3030
maximize_ubuntu_github_actions_build_space
3131
- name: Docker build
32-
run: |
33-
docker/docker_build.sh openblas-amd64-py310-dev
34-
- name: GCloud CLI auth
35-
uses: 'google-github-actions/auth@v1'
36-
with:
37-
project_id: ${{ secrets.GCE_PROJECT }}
38-
credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
39-
- name: GCloud CLI setup
40-
uses: google-github-actions/setup-gcloud@v1
41-
with:
42-
version: ${{ env.GCE_CLI_GHA_VERSION }}
43-
project_id: ${{ secrets.GCE_PROJECT }}
32+
run: docker/docker_build.sh openblas-amd64-py310-dev
33+
4434
- name: Docker test
45-
run: |
46-
docker/docker_test.sh openblas-amd64-py310-dev
35+
run: docker/docker_test.sh openblas-amd64-py310-dev
4736

4837
# With forked repo, the GitHub secret is not available.
4938
skip-arm64-check-on-fork:

‎.github/workflows/ubuntu-sycl.yml

+3
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,15 @@ jobs:
4343
else
4444
docker/docker_test.sh sycl-static
4545
fi
46+
4647
- name: GCloud CLI auth
48+
if: ${{ github.ref == 'refs/heads/master' }}
4749
uses: 'google-github-actions/auth@v1'
4850
with:
4951
project_id: ${{ secrets.GCE_PROJECT }}
5052
credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
5153
- name: GCloud CLI setup
54+
if: ${{ github.ref == 'refs/heads/master' }}
5255
uses: google-github-actions/setup-gcloud@v1
5356
with:
5457
version: ${{ env.GCE_CLI_GHA_VERSION }}

‎.github/workflows/ubuntu-wheel.yml

-2
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,11 @@ jobs:
158158
needs: [build-wheel]
159159
steps:
160160
- name: GCloud CLI auth
161-
if: ${{ github.ref == 'refs/heads/master' }}
162161
uses: 'google-github-actions/auth@v1'
163162
with:
164163
project_id: ${{ secrets.GCE_PROJECT }}
165164
credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
166165
- name: GCloud CLI setup
167-
if: ${{ github.ref == 'refs/heads/master' }}
168166
uses: google-github-actions/setup-gcloud@v1
169167
with:
170168
version: ${{ env.GCE_CLI_GHA_VERSION }}

‎.github/workflows/windows.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,13 @@ jobs:
167167
--target Open3DViewer
168168
cmake --build . --parallel ${{ env.NPROC }} --config ${{ matrix.CONFIG }} `
169169
--target INSTALL
170-
New-Item -ItemType "directory" -Force -Path "package"
171-
Compress-Archive -LiteralPath "C:\Program Files\Open3D\bin\Open3D" `
172-
-DestinationPath "package/open3d-app-windows-amd64.zip"
173170
174171
- name: Upload Viewer
175172
if: ${{ matrix.BUILD_SHARED_LIBS == 'OFF' && matrix.STATIC_RUNTIME == 'ON' && matrix.BUILD_CUDA_MODULE == 'OFF' && matrix.CONFIG == 'Release' }}
176173
uses: actions/upload-artifact@v3
177174
with:
178-
name: open3d-app-windows
179-
path: ${{ env.BUILD_DIR }}/package/open3d-app-windows-amd64.zip
175+
name: open3d-app-windows-amd64
176+
path: C:\Program Files\Open3D\bin\Open3D
180177
if-no-files-found: error
181178

182179
- name: GCloud CLI auth
@@ -426,13 +423,11 @@ jobs:
426423
needs: [build-wheel, windows]
427424
steps:
428425
- name: GCloud CLI auth
429-
if: ${{ github.ref == 'refs/heads/master' }}
430426
uses: google-github-actions/auth@v1
431427
with:
432428
project_id: ${{ secrets.GCE_PROJECT }}
433429
credentials_json: '${{ secrets.GCE_SA_KEY_GPU_CI }}'
434430
- name: GCloud CLI setup
435-
if: ${{ github.ref == 'refs/heads/master' }}
436431
uses: google-github-actions/setup-gcloud@v1
437432
with:
438433
version: ${{ env.GCE_CLI_GHA_VERSION }}

‎LICENSE

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22

33
Open3D: www.open3d.org
4-
Copyright (c) 2018-2021 www.open3d.org
4+
Copyright (c) 2018-2023 www.open3d.org
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal
@@ -20,3 +20,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2020
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2121
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
THE SOFTWARE.
23+
24+
SPDX-License-Identifier: MIT

‎cmake/ShaderEncoder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// ----------------------------------------------------------------------------
44
// The MIT License (MIT)
55
//
6-
// Copyright (c) 2018-2021 www.open3d.org
6+
// Copyright (c) 2018-2023 www.open3d.org
77
//
88
// Permission is hereby granted, free of charge, to any person obtaining a copy
99
// of this software and associated documentation files (the "Software"), to deal

‎cmake/ShaderLinker.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// ----------------------------------------------------------------------------
44
// The MIT License (MIT)
55
//
6-
// Copyright (c) 2018-2021 www.open3d.org
6+
// Copyright (c) 2018-2023 www.open3d.org
77
//
88
// Permission is hereby granted, free of charge, to any person obtaining a copy
99
// of this software and associated documentation files (the "Software"), to deal
@@ -49,7 +49,7 @@ int main(int argc, char **argv) {
4949
fprintf(file_out, "// ----------------------------------------------------------------------------\n");
5050
fprintf(file_out, "// The MIT License (MIT)\n");
5151
fprintf(file_out, "//\n");
52-
fprintf(file_out, "// Copyright (c) 2018-2021 www.open3d.org\n");
52+
fprintf(file_out, "// Copyright (c) 2018-2023 www.open3d.org\n");
5353
fprintf(file_out, "//\n");
5454
fprintf(file_out, "// Permission is hereby granted, free of charge, to any person obtaining a copy\n");
5555
fprintf(file_out, "// of this software and associated documentation files (the \"Software\"), to deal\n");

‎cmake/ispc_isas/ISADispatcher.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// ----------------------------------------------------------------------------
44
// The MIT License (MIT)
55
//
6-
// Copyright (c) 2018-2021 www.open3d.org
6+
// Copyright (c) 2018-2023 www.open3d.org
77
//
88
// Permission is hereby granted, free of charge, to any person obtaining a copy
99
// of this software and associated documentation files (the "Software"), to deal

‎cmake/ispc_isas/ISADispatcher.ispc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// ----------------------------------------------------------------------------
44
// The MIT License (MIT)
55
//
6-
// Copyright (c) 2018-2021 www.open3d.org
6+
// Copyright (c) 2018-2023 www.open3d.org
77
//
88
// Permission is hereby granted, free of charge, to any person obtaining a copy
99
// of this software and associated documentation files (the "Software"), to deal

‎cpp/apps/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
macro(open3d_add_app SRC_DIR APP_NAME TARGET_NAME)
1+
macro(open3d_add_app_gui SRC_DIR APP_NAME TARGET_NAME)
22
set(APPS_DIR "${PROJECT_SOURCE_DIR}/cpp/apps")
33
set(SOURCE_DIR "${APPS_DIR}/${SRC_DIR}")
44

@@ -73,6 +73,9 @@ macro(open3d_add_app SRC_DIR APP_NAME TARGET_NAME)
7373
# Various caches need to be updated for the app to become visible
7474
install(CODE "execute_process(COMMAND ${SOURCE_DIR}/postinstall-linux.sh)")
7575
elseif (WIN32)
76+
# Don't create a command window on launch
77+
target_sources(${TARGET_NAME} PRIVATE "${SOURCE_DIR}/icon.rc") # add icon
78+
7679
# MSVC puts the binary in bin/Open3D/Release/Open3D.exe
7780
# so we can't just install() the build results, and need to do them piecemeal.
7881
install(DIRECTORY "${APP_DIR}/resources"
@@ -105,9 +108,6 @@ macro(open3d_add_app_common SRC_DIR APP_NAME TARGET_NAME)
105108
OUTPUT_NAME ${APP_NAME}
106109
)
107110
elseif (WIN32)
108-
# MSVC started giving LNK:1114, error 5, which appears to be caused by
109-
# the executable having the same name as the library. (Except that this
110-
# was working before, so not sure what changed.)
111111
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../${APP_NAME}")
112112
add_executable(${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
113113
else()
@@ -128,7 +128,7 @@ endmacro()
128128

129129
if (BUILD_GUI)
130130
open3d_add_app_common(Open3DViewer Open3D Open3DViewer)
131-
open3d_add_app(Open3DViewer Open3D Open3DViewer)
131+
open3d_add_app_gui(Open3DViewer Open3D Open3DViewer)
132132
endif()
133133

134134
open3d_add_app_common(OfflineReconstruction OfflineReconstruction OfflineReconstruction)

‎cpp/apps/OfflineReconstruction/Config.h

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
11
// ----------------------------------------------------------------------------
22
// - Open3D: www.open3d.org -
33
// ----------------------------------------------------------------------------
4-
// The MIT License (MIT)
5-
//
6-
// Copyright (c) 2018-2021 www.open3d.org
7-
//
8-
// Permission is hereby granted, free of charge, to any person obtaining a copy
9-
// of this software and associated documentation files (the "Software"), to deal
10-
// in the Software without restriction, including without limitation the rights
11-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
// copies of the Software, and to permit persons to whom the Software is
13-
// furnished to do so, subject to the following conditions:
14-
//
15-
// The above copyright notice and this permission notice shall be included in
16-
// all copies or substantial portions of the Software.
17-
//
18-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23-
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24-
// IN THE SOFTWARE.
4+
// Copyright (c) 2018-2023 www.open3d.org
5+
// SPDX-License-Identifier: MIT
256
// ----------------------------------------------------------------------------
267

278
#pragma once

‎cpp/apps/OfflineReconstruction/DebugUtil.h

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
11
// ----------------------------------------------------------------------------
22
// - Open3D: www.open3d.org -
33
// ----------------------------------------------------------------------------
4-
// The MIT License (MIT)
5-
//
6-
// Copyright (c) 2018-2021 www.open3d.org
7-
//
8-
// Permission is hereby granted, free of charge, to any person obtaining a copy
9-
// of this software and associated documentation files (the "Software"), to deal
10-
// in the Software without restriction, including without limitation the rights
11-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
// copies of the Software, and to permit persons to whom the Software is
13-
// furnished to do so, subject to the following conditions:
14-
//
15-
// The above copyright notice and this permission notice shall be included in
16-
// all copies or substantial portions of the Software.
17-
//
18-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23-
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24-
// IN THE SOFTWARE.
4+
// Copyright (c) 2018-2023 www.open3d.org
5+
// SPDX-License-Identifier: MIT
256
// ----------------------------------------------------------------------------
267

278
#pragma once

‎cpp/apps/OfflineReconstruction/FileSystemUtil.h

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
11
// ----------------------------------------------------------------------------
22
// - Open3D: www.open3d.org -
33
// ----------------------------------------------------------------------------
4-
// The MIT License (MIT)
5-
//
6-
// Copyright (c) 2018-2021 www.open3d.org
7-
//
8-
// Permission is hereby granted, free of charge, to any person obtaining a copy
9-
// of this software and associated documentation files (the "Software"), to deal
10-
// in the Software without restriction, including without limitation the rights
11-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
// copies of the Software, and to permit persons to whom the Software is
13-
// furnished to do so, subject to the following conditions:
14-
//
15-
// The above copyright notice and this permission notice shall be included in
16-
// all copies or substantial portions of the Software.
17-
//
18-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23-
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24-
// IN THE SOFTWARE.
4+
// Copyright (c) 2018-2023 www.open3d.org
5+
// SPDX-License-Identifier: MIT
256
// ----------------------------------------------------------------------------
267

278
#pragma once

‎cpp/apps/OfflineReconstruction/LegacyReconstructionUtil.h

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
11
// ----------------------------------------------------------------------------
22
// - Open3D: www.open3d.org -
33
// ----------------------------------------------------------------------------
4-
// The MIT License (MIT)
5-
//
6-
// Copyright (c) 2018-2021 www.open3d.org
7-
//
8-
// Permission is hereby granted, free of charge, to any person obtaining a copy
9-
// of this software and associated documentation files (the "Software"), to deal
10-
// in the Software without restriction, including without limitation the rights
11-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
// copies of the Software, and to permit persons to whom the Software is
13-
// furnished to do so, subject to the following conditions:
14-
//
15-
// The above copyright notice and this permission notice shall be included in
16-
// all copies or substantial portions of the Software.
17-
//
18-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23-
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24-
// IN THE SOFTWARE.
4+
// Copyright (c) 2018-2023 www.open3d.org
5+
// SPDX-License-Identifier: MIT
256
// ----------------------------------------------------------------------------
267

278
#pragma once

‎cpp/apps/OfflineReconstruction/OfflineReconstruction.cpp

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
11
// ----------------------------------------------------------------------------
22
// - Open3D: www.open3d.org -
33
// ----------------------------------------------------------------------------
4-
// The MIT License (MIT)
5-
//
6-
// Copyright (c) 2018-2021 www.open3d.org
7-
//
8-
// Permission is hereby granted, free of charge, to any person obtaining a copy
9-
// of this software and associated documentation files (the "Software"), to deal
10-
// in the Software without restriction, including without limitation the rights
11-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
// copies of the Software, and to permit persons to whom the Software is
13-
// furnished to do so, subject to the following conditions:
14-
//
15-
// The above copyright notice and this permission notice shall be included in
16-
// all copies or substantial portions of the Software.
17-
//
18-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23-
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24-
// IN THE SOFTWARE.
4+
// Copyright (c) 2018-2023 www.open3d.org
5+
// SPDX-License-Identifier: MIT
256
// ----------------------------------------------------------------------------
267

278
#include "Config.h"

‎cpp/apps/Open3DViewer/Open3DViewer.cpp

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
11
// ----------------------------------------------------------------------------
22
// - Open3D: www.open3d.org -
33
// ----------------------------------------------------------------------------
4-
// The MIT License (MIT)
5-
//
6-
// Copyright (c) 2018-2021 www.open3d.org
7-
//
8-
// Permission is hereby granted, free of charge, to any person obtaining a copy
9-
// of this software and associated documentation files (the "Software"), to deal
10-
// in the Software without restriction, including without limitation the rights
11-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
// copies of the Software, and to permit persons to whom the Software is
13-
// furnished to do so, subject to the following conditions:
14-
//
15-
// The above copyright notice and this permission notice shall be included in
16-
// all copies or substantial portions of the Software.
17-
//
18-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23-
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24-
// IN THE SOFTWARE.
4+
// Copyright (c) 2018-2023 www.open3d.org
5+
// SPDX-License-Identifier: MIT
256
// ----------------------------------------------------------------------------
267

278
#include <string>

0 commit comments

Comments
 (0)