Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into vtkm_io_sans_device_source

Browse Source
This commit is contained in:
Li-Ta Lo 2021-10-15 17:03:40 -06:00
commit 81fe1254ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/ci/ubuntu2004.yml
View File

@ -74,7 +74,7 @@ build:ubuntu2004_hip_kokkos:
CMAKE_BUILD_TYPE: RelWithDebInfo
VTKM_SETTINGS: "benchmarks+kokkos+hip+no_virtual+no_rendering"
CMAKE_PREFIX_PATH: "/opt/rocm/lib/cmake"
CTEST_MAX_PARALLELISM: "3"
CTEST_MAX_PARALLELISM: "1"
timeout: 12 hours
test:ubuntu2004_hip_kokkos:
@ -93,4 +93,4 @@ test:ubuntu2004_hip_kokkos:
- build:ubuntu2004_hip_kokkos
needs:
- build:ubuntu2004_hip_kokkos
timeout: 2 hours
timeout: 3 hours

2
docs/changelog/vtkm_io_sans_device_sources.md
View File

@ -4,4 +4,4 @@ It used to be that every .cxx file which uses ArrayHandle needs to be compiled
by the device compiler. A recent change had removed this restriction.
One exception is that user of ArrayCopy still requires device compiler.
Since most .cxx files in vtkm/io do not use ArrayCopy, they are moved
to SOURCES and are compiled by host compiler.
to SOURCES and are compiled by host compiler.