Skip to content

Commit 0efd583

Browse files
authored
Merge branch 'AcademySoftwareFoundation:master' into angle-brackets
2 parents a510c00 + 1feb28e commit 0efd583

File tree

84 files changed

+12743
-1141
lines changed

Some content is hidden

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

84 files changed

+12743
-1141
lines changed

.github/workflows/ax.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
github.event_name != 'workflow_dispatch' ||
5050
github.event.inputs.type == 'all' ||
5151
github.event.inputs.type == 'linux'
52-
runs-on: ubuntu-latest
52+
runs-on: ubuntu-20.04-8c-32g-300h
5353
name: >
5454
linux-ax:${{ matrix.config.image }}-cxx:${{ matrix.config.cxx }}-${{ matrix.config.build }}
5555
container:
@@ -61,11 +61,11 @@ jobs:
6161
matrix:
6262
config:
6363
# Unified
64-
- { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '2', components: 'core,python,bin,axcore,axbin,axtest' }
65-
- { image: '2021-clang10', cxx: 'g++', build: 'Release', j: '1', components: 'core,python,bin,axcore,axbin,axtest' }
66-
- { image: '2022-clang11', cxx: 'clang++', build: 'Debug', j: '2', components: 'core,python,bin,axcore,axbin,axtest' }
67-
- { image: '2022-clang11', cxx: 'clang++', build: 'Release', j: '2', components: 'core,python,bin,axcore,axbin,axtest' }
68-
- { image: '2022-clang11', cxx: 'g++', build: 'Release', j: '1', components: 'core,python,bin,axcore,axbin,axtest' }
64+
- { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
65+
- { image: '2021-clang10', cxx: 'g++', build: 'Release', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
66+
- { image: '2022-clang11', cxx: 'clang++', build: 'Debug', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
67+
- { image: '2022-clang11', cxx: 'clang++', build: 'Release', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
68+
- { image: '2022-clang11', cxx: 'g++', build: 'Release', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
6969
fail-fast: false
7070
steps:
7171
- uses: actions/checkout@v3
@@ -158,7 +158,7 @@ jobs:
158158
if: |
159159
github.event_name == 'workflow_dispatch' &&
160160
github.event.inputs.type == 'grammar'
161-
runs-on: ubuntu-latest
161+
runs-on: ubuntu-20.04-8c-32g-300h
162162
container:
163163
image: aswf/ci-openvdb:2022-clang11
164164
steps:

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
github.event_name != 'workflow_dispatch' ||
5757
github.event.inputs.type == 'all' ||
5858
github.event.inputs.type == 'linux'
59-
runs-on: ubuntu-latest
59+
runs-on: ubuntu-20.04-8c-32g-300h
6060
name: >
6161
linux-vfx:${{ matrix.config.image }}-
6262
abi:${{ matrix.config.abi }}-
@@ -118,7 +118,7 @@ jobs:
118118
github.event_name != 'workflow_dispatch' ||
119119
github.event.inputs.type == 'all' ||
120120
github.event.inputs.type == 'win'
121-
runs-on: windows-2019
121+
runs-on: windows-2022-8c-32g-300h
122122
name: windows-vc:${{ matrix.config.vc }}-type:${{ matrix.config.build }}
123123
env:
124124
VCPKG_DEFAULT_TRIPLET: ${{ matrix.config.vc }}
@@ -131,10 +131,10 @@ jobs:
131131
# USE_EXPLICIT_INSTANTIATION is disabled for debug static libraries
132132
# due to disk space constraints
133133
# @note Commented out the static debug build due to linker OOM LNK1102
134-
- { vc: 'x64-windows-static', components: 'core,bin,view,render,test', build: 'Release', cmake: '-A x64 -G \"Visual Studio 16 2019\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON' }
135-
#- { vc: 'x64-windows-static', components: 'core,bin,view,render,test', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 16 2019\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON -DUSE_EXPLICIT_INSTANTIATION=OFF' }
136-
- { vc: 'x64-windows', components: 'core,bin,view,render,python,test', build: 'Release', cmake: '-A x64 -G \"Visual Studio 16 2019\" -DOPENVDB_CORE_STATIC=OFF' }
137-
- { vc: 'x64-windows', components: 'core,bin,view,render,python,test', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 16 2019\" -DOPENVDB_CORE_STATIC=OFF' }
134+
- { vc: 'x64-windows-static', components: 'core,bin,view,render,test', build: 'Release', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON' }
135+
#- { vc: 'x64-windows-static', components: 'core,bin,view,render,test', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON -DUSE_EXPLICIT_INSTANTIATION=OFF' }
136+
- { vc: 'x64-windows', components: 'core,bin,view,render,python,test', build: 'Release', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_STATIC=OFF' }
137+
- { vc: 'x64-windows', components: 'core,bin,view,render,python,test', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_STATIC=OFF' }
138138
#- { vc: 'x64-windows', build: 'Release', cmake: '-G \"MinGW Makefiles\" -DOPENVDB_CORE_STATIC=OFF' }
139139
fail-fast: false
140140
steps:

.github/workflows/houdini.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# Check that valid github secrets have been set. This isn't needed to retrieve
4242
# the cache, but ensures that the job doens't start with an empty cache
4343
name: Verify Houdini Secrets
44-
runs-on: ubuntu-latest
44+
runs-on: ubuntu-20.04-8c-32g-300h
4545
outputs:
4646
HOUDINI_SECRETS: ${{ steps.check.outputs.HOUDINI_SECRETS }}
4747
steps:
@@ -56,11 +56,10 @@ jobs:
5656

5757
linux-vfx-houdini:
5858
needs: [checksecret]
59-
# if: >
60-
# ${{ needs.checksecret.outputs.HOUDINI_SECRETS == 'true' ||
61-
# github.repository_owner == 'AcademySoftwareFoundation' }}
62-
if: ${{ false }} # disable for now
63-
runs-on: ubuntu-latest
59+
if: >
60+
${{ needs.checksecret.outputs.HOUDINI_SECRETS == 'true' ||
61+
github.repository_owner == 'AcademySoftwareFoundation' }}
62+
runs-on: ubuntu-20.04-8c-32g-300h
6463
name: hou:${{ matrix.config.hou }}-vfx:${{ matrix.config.image }}-cxx:${{ matrix.config.cxx }}
6564
container:
6665
image: aswf/ci-base:${{ matrix.config.image }}
@@ -70,11 +69,11 @@ jobs:
7069
strategy:
7170
matrix:
7271
config:
73-
- { cxx: clang++, image: '2021', hou: '19_5', j: '2', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest', disable_checks: 'OFF' }
72+
- { cxx: clang++, image: '2021', hou: '19_5', j: '8', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest', disable_checks: 'OFF' }
7473
# Houdini 19 is technically on VFX 2020, but we need 2021 dependencies for VDB 10
75-
- { cxx: clang++, image: '2021', hou: '19_0', j: '2', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest', disable_checks: 'ON' }
76-
- { cxx: clang++, image: '2021', hou: '19_5', j: '2', build: 'Debug', components: 'core,hou', disable_checks: 'OFF' }
77-
- { cxx: g++, image: '2021', hou: '19_5', j: '1', build: 'Release', components: 'core,hou', disable_checks: 'OFF' }
74+
- { cxx: clang++, image: '2021', hou: '19_0', j: '8', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest', disable_checks: 'ON' }
75+
- { cxx: clang++, image: '2021', hou: '19_5', j: '8', build: 'Debug', components: 'core,hou', disable_checks: 'OFF' }
76+
- { cxx: g++, image: '2021', hou: '19_5', j: '8', build: 'Release', components: 'core,hou', disable_checks: 'OFF' }
7877
fail-fast: false
7978
steps:
8079
- uses: actions/checkout@v3
@@ -109,13 +108,11 @@ jobs:
109108
cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd -
110109
- name: build
111110
shell: bash
112-
run: >
113-
cd $HOME/houdini_install/hou && source houdini_setup_bash && cd - &&
114-
./ci/build.sh -v
115-
-j ${{ matrix.config.j }}
116-
--build-type=${{ matrix.config.build }}
117-
--components="${{ matrix.config.components }}"
118-
--cargs=\"-DDISABLE_CMAKE_SEARCH_PATHS=ON -DOPENVDB_BUILD_HOUDINI_ABITESTS=ON -DOPENVDB_HOUDINI_INSTALL_PREFIX=/tmp -DDISABLE_DEPENDENCY_VERSION_CHECKS=${{ matrix.config.disable_checks }}\"
111+
run: |
112+
export HFS="$HOME/houdini_install/hou"
113+
export HDSO="${HFS}/dsolib"
114+
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib64:${HDSO}"
115+
./ci/build.sh -v --build-type=Release --components="core,hou" --cargs=\"-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON -DDISABLE_CMAKE_SEARCH_PATHS=ON -DOPENVDB_BUILD_HOUDINI_ABITESTS=OFF -DOPENVDB_HOUDINI_INSTALL_PREFIX=/tmp\ -DTBB_INCLUDEDIR=/usr/local/include -DTBB_LIBRARYDIR=/usr/local/lib\"
119116
- name: test
120117
run: cd build && ctest -V
121118
# Keep ccache light by stripping out any caches not accessed in the last day

.github/workflows/nanovdb.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
github.event_name != 'workflow_dispatch' ||
5050
github.event.inputs.type == 'all' ||
5151
github.event.inputs.type == 'linux'
52-
runs-on: ubuntu-latest
52+
runs-on: ubuntu-20.04-8c-32g-300h
5353
name: >
5454
linux-nanovdb:cxx:${{ matrix.config.cxx }}-${{ matrix.config.build }}
5555
container:
@@ -93,21 +93,21 @@ jobs:
9393
github.event_name != 'workflow_dispatch' ||
9494
github.event.inputs.type == 'all' ||
9595
github.event.inputs.type == 'win'
96-
runs-on: windows-2019
96+
runs-on: windows-2022-8c-32g-300h
9797
env:
9898
VCPKG_DEFAULT_TRIPLET: ${{ matrix.config.vc }}
99-
visual_studio: "Visual Studio 16 2019"
100-
cuda: "11.0.3"
99+
visual_studio: "Visual Studio 17 2022"
100+
cuda: "11.6.2"
101101
strategy:
102102
matrix:
103103
config:
104104
# static build of blosc from vcpkg does not build internal sources.
105105
# USE_STATIC_DEPENDENCIES is required for IlmBase/OpenEXR defines and
106106
# Boost as both shared and static libs are installed.
107-
- { vc: 'x64-windows-static', build: 'Release', cmake: '-A x64 -G \"Visual Studio 16 2019\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON' }
108-
- { vc: 'x64-windows-static', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 16 2019\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON' }
109-
- { vc: 'x64-windows', build: 'Release', cmake: '-A x64 -G \"Visual Studio 16 2019\" -DOPENVDB_CORE_STATIC=OFF' }
110-
- { vc: 'x64-windows', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 16 2019\" -DOPENVDB_CORE_STATIC=OFF' }
107+
- { vc: 'x64-windows-static', build: 'Release', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON' }
108+
- { vc: 'x64-windows-static', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON' }
109+
- { vc: 'x64-windows', build: 'Release', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_STATIC=OFF' }
110+
- { vc: 'x64-windows', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_STATIC=OFF' }
111111
fail-fast: false
112112
steps:
113113
- uses: actions/checkout@v3
@@ -175,7 +175,7 @@ jobs:
175175
github.event_name != 'workflow_dispatch' ||
176176
github.event.inputs.type == 'all' ||
177177
github.event.inputs.type == 'linux'
178-
runs-on: ubuntu-latest
178+
runs-on: ubuntu-20.04-8c-32g-300h
179179
steps:
180180
- uses: actions/checkout@v3
181181
- name: install_gtest
@@ -188,5 +188,5 @@ jobs:
188188
sudo mkdir .build
189189
cd .build
190190
sudo cmake -DUSE_EXPLICIT_INSTANTIATION=OFF -DNANOVDB_BUILD_UNITTESTS=ON ../
191-
sudo make -j2 install
191+
sudo make -j8 install
192192
sudo ctest -V

.github/workflows/weekly.yml

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
# download Houdini and cache it. The secrets are used in download_houdini.py
3131
checksecret:
3232
name: Verify Houdini Secrets
33-
runs-on: ubuntu-latest
33+
runs-on: ubuntu-20.04-8c-32g-300h
3434
outputs:
3535
HOUDINI_SECRETS: ${{ steps.check.outputs.HOUDINI_SECRETS }}
3636
steps:
@@ -44,18 +44,17 @@ jobs:
4444
run: echo "HOUDINI_CLIENT_ID and HOUDINI_SECRET_KEY GitHub Action Secrets needs to be set to install Houdini builds"
4545

4646
# download the latest production version of Houdini X, strip out headers,
47-
# libraries and binaries required for building OpenVDB and if the build
48-
# succeeds, put it into the GitHub Actions cache
47+
# libraries and binaries required for building OpenVDB and put it into
48+
# the GitHub Actions cache
4949
linux_houdini:
5050
needs: [checksecret]
51-
# if: |
52-
# (needs.checksecret.outputs.HOUDINI_SECRETS == 'true' ||
53-
# github.repository_owner == 'AcademySoftwareFoundation') &&
54-
# (github.event_name != 'workflow_dispatch' ||
55-
# github.event.inputs.type == 'all' ||
56-
# github.event.inputs.type == 'houdini')
57-
if: ${{ false }} # disable for now
58-
runs-on: ubuntu-latest
51+
if: |
52+
(needs.checksecret.outputs.HOUDINI_SECRETS == 'true' ||
53+
github.repository_owner == 'AcademySoftwareFoundation') &&
54+
(github.event_name != 'workflow_dispatch' ||
55+
github.event.inputs.type == 'all' ||
56+
github.event.inputs.type == 'houdini')
57+
runs-on: ubuntu-20.04-8c-32g-300h
5958
name: linux-houdini:${{ matrix.config.houdini_version }}
6059
env:
6160
CXX: clang++
@@ -82,16 +81,6 @@ jobs:
8281
mkdir $HOME/houdini_install
8382
cp hou/hou.tar.gz $HOME/houdini_install/hou.tar.gz
8483
cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd -
85-
- name: build
86-
shell: bash
87-
run: >
88-
cd $HOME/houdini_install/hou && source houdini_setup_bash && cd - &&
89-
./ci/build.sh -v
90-
--build-type=Release
91-
--components="core,hou,bin,view,render,python,test,axcore,axbin,axtest"
92-
--cargs=\"-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON -DDISABLE_CMAKE_SEARCH_PATHS=ON -DOPENVDB_BUILD_HOUDINI_ABITESTS=ON -DOPENVDB_HOUDINI_INSTALL_PREFIX=/tmp\"
93-
- name: test
94-
run: cd build && ctest -V
9584
- name: write_houdini_cache
9685
uses: actions/cache@v2
9786
with:
@@ -109,7 +98,7 @@ jobs:
10998
github.event_name != 'workflow_dispatch' ||
11099
github.event.inputs.type == 'all' ||
111100
github.event.inputs.type == 'extra'
112-
runs-on: ubuntu-latest
101+
runs-on: ubuntu-20.04-8c-32g-300h
113102
name: linux-extra:${{ matrix.config.name }}
114103
container:
115104
# Can bump clang when AX is compatible with LLVM14
@@ -177,7 +166,7 @@ jobs:
177166
github.event_name != 'workflow_dispatch' ||
178167
github.event.inputs.type == 'all' ||
179168
github.event.inputs.type == 'ax'
180-
runs-on: ubuntu-latest
169+
runs-on: ubuntu-20.04-8c-32g-300h
181170
name: >
182171
linux-ax:${{ matrix.config.image }}-cxx:${{ matrix.config.cxx }}-${{ matrix.config.build }}
183172
container:
@@ -188,15 +177,15 @@ jobs:
188177
matrix:
189178
config:
190179
# Unified
191-
- { image: '2022-clang14', cxx: 'clang++', build: 'Release', j: '2', components: 'core,bin,axcore,axbin,axtest' }
192-
- { image: '2022-clang14', cxx: 'g++', build: 'Release', j: '1', components: 'core,bin,axcore,axbin,axtest' }
193-
- { image: '2022-clang13', cxx: 'clang++', build: 'Release', j: '2', components: 'core,bin,axcore,axbin,axtest' }
194-
- { image: '2022-clang13', cxx: 'g++', build: 'Release', j: '1', components: 'core,bin,axcore,axbin,axtest' }
180+
- { image: '2022-clang14', cxx: 'clang++', build: 'Release', j: '8', components: 'core,bin,axcore,axbin,axtest' }
181+
- { image: '2022-clang14', cxx: 'g++', build: 'Release', j: '8', components: 'core,bin,axcore,axbin,axtest' }
182+
- { image: '2022-clang13', cxx: 'clang++', build: 'Release', j: '8', components: 'core,bin,axcore,axbin,axtest' }
183+
- { image: '2022-clang13', cxx: 'g++', build: 'Release', j: '8', components: 'core,bin,axcore,axbin,axtest' }
195184
# Standalone
196-
- { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '2', components: 'core' }
197-
- { image: '2022-clang11', cxx: 'clang++', build: 'Debug', j: '2', components: 'core' }
198-
- { image: '2022-clang11', cxx: 'clang++', build: 'Release', j: '2', components: 'core' }
199-
- { image: '2022-clang11', cxx: 'g++', build: 'Release', j: '1', components: 'core' }
185+
- { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '8', components: 'core' }
186+
- { image: '2022-clang11', cxx: 'clang++', build: 'Debug', j: '8', components: 'core' }
187+
- { image: '2022-clang11', cxx: 'clang++', build: 'Release', j: '8', components: 'core' }
188+
- { image: '2022-clang11', cxx: 'g++', build: 'Release', j: '8', components: 'core' }
200189
fail-fast: false
201190
steps:
202191
- uses: actions/checkout@v3
@@ -270,7 +259,7 @@ jobs:
270259
github.event_name != 'workflow_dispatch' ||
271260
github.event.inputs.type == 'all' ||
272261
github.event.inputs.type == 'ax'
273-
runs-on: windows-2019
262+
runs-on: windows-2022-8c-32g-300h
274263
name: windows-vc:${{ matrix.config.vc }}-type:${{ matrix.config.build }}
275264
env:
276265
VCPKG_DEFAULT_TRIPLET: ${{ matrix.config.vc }}
@@ -307,7 +296,7 @@ jobs:
307296
--config=${{ matrix.config.build }}
308297
--components="${{ matrix.config.components }}"
309298
--cargs=\'
310-
-A x64 -G \"Visual Studio 16 2019\"
299+
-A x64 -G \"Visual Studio 17 2022\"
311300
-DVCPKG_TARGET_TRIPLET=${VCPKG_DEFAULT_TRIPLET}
312301
-DCMAKE_TOOLCHAIN_FILE=\"${VCPKG_INSTALLATION_ROOT}\\scripts\\buildsystems\\vcpkg.cmake\"
313302
-DMSVC_COMPRESS_PDB=ON
@@ -335,7 +324,7 @@ jobs:
335324
github.event_name != 'workflow_dispatch' ||
336325
github.event.inputs.type == 'all' ||
337326
github.event.inputs.type == 'blosc'
338-
runs-on: ubuntu-latest
327+
runs-on: ubuntu-20.04-8c-32g-300h
339328
name: linux-blosc:${{ matrix.blosc }}
340329
container:
341330
image: aswf/ci-base:2021

ci/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ declare -A PARMS
2929
PARMS[--components]=core,bin
3030
PARMS[--target]=install
3131
PARMS[--build-dir]=build
32-
# github actions runners have 2 threads
32+
# github actions runners have 8 threads
3333
# https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
34-
PARMS[-j]=2
34+
PARMS[-j]=8
3535

3636
# Available options for --components
3737
declare -A COMPONENTS
@@ -155,7 +155,7 @@ fi
155155

156156
################################################
157157

158-
# github actions runners have 2 threads
158+
# github actions runners have 8 threads
159159
# https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
160160
export CMAKE_BUILD_PARALLEL_LEVEL=${PARMS[-j]}
161161
echo "Build using ${CMAKE_BUILD_PARALLEL_LEVEL} threads"

ci/install_blosc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ cmake \
3232
"${CMAKE_EXTRA[@]}" \
3333
..
3434

35-
make -j4
35+
make -j8
3636
make install

ci/install_doxygen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ fi
1414
mkdir build
1515
cd build
1616
cmake ../.
17-
make -j4
17+
make -j8
1818
make install

ci/install_gtest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ fi
1414
mkdir build
1515
cd build
1616
cmake ../.
17-
make -j4
17+
make -j8
1818
make install

ci/install_windows_cuda.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ $CUDA_KNOWN_URLS = @{
2525
"11.2.0" = "https://developer.download.nvidia.com/compute/cuda/11.2.0/network_installers/cuda_11.2.0_win10_network.exe";
2626
"11.2.1" = "https://developer.download.nvidia.com/compute/cuda/11.2.1/network_installers/cuda_11.2.1_win10_network.exe";
2727
"11.2.2" = "https://developer.download.nvidia.com/compute/cuda/11.2.2/network_installers/cuda_11.2.2_win10_network.exe";
28-
"11.3.0" = "https://developer.download.nvidia.com/compute/cuda/11.3.0/network_installers/cuda_11.3.0_win10_network.exe"
28+
"11.3.0" = "https://developer.download.nvidia.com/compute/cuda/11.3.0/network_installers/cuda_11.3.0_win10_network.exe";
29+
"11.6.2" = "https://developer.download.nvidia.com/compute/cuda/11.6.2/network_installers/cuda_11.6.2_windows_network.exe"
2930
}
3031

3132
# @todo - change this to be based on _MSC_VER intead, or invert it to be CUDA keyed instead?
3233
$VISUAL_STUDIO_MIN_CUDA = @{
34+
"2022" = "11.6";
3335
"2019" = "10.1";
3436
"2017" = "10.0"; # Depends on which version of 2017! 9.0 to 10.0 depending on version
3537
"2015" = "8.0"; # might support older, unsure.
@@ -43,6 +45,7 @@ $CUDA_PACKAGES_IN = @(
4345
"curand_dev";
4446
"nvrtc_dev";
4547
"cudart";
48+
"thrust";
4649
)
4750

4851

0 commit comments

Comments
 (0)