1ce2922d15
Fix compiler warnings...... Kick the dashboards.......... Kick the dashboards..... use lambda instead of functor, remove unused code ArrayHandle::StorageType should be public StorageType is public in vtkm::cont::ArrayHandle, but some subclasses re-declare it as private. Having it public provides a convenient way to get the storage type of an ArrayHandle, otherwise it is quite verbose. Addresses: #314 Tetrahedralize and Triangulate filters check if input is already triangulated Previously, tetrahedralize/triangulate would blindly convert all the cells to tetrahedra/triangles, even when they were already. Now, the dataset is directly returned if the CellSet is a CellSetSingleType of tetras/triangles, and no further processing is done in the worklets for CellSetExplicit when all shapes are tetras or triangles. ci,crusher: changed fs to orion ci,osx,macos: fix value of GIT_CLONE_PATH
86 lines
2.2 KiB
YAML
86 lines
2.2 KiB
YAML
# Ad-hoc build that runs in macos machines
|
|
build:macos_xcode13:
|
|
extends:
|
|
- .macos_xcode13
|
|
- .macos_build_tags
|
|
- .cmake_build_macos
|
|
- .run_automatically
|
|
|
|
test:macos_xcode13:
|
|
extends:
|
|
- .macos_xcode13
|
|
- .macos_build_tags
|
|
- .cmake_test_macos
|
|
- .run_automatically
|
|
needs:
|
|
- build:macos_xcode13
|
|
dependencies:
|
|
- build:macos_xcode13
|
|
|
|
.macos_xcode13:
|
|
variables:
|
|
CMAKE_BUILD_TYPE: RelWithDebInfo
|
|
CMAKE_GENERATOR: Ninja
|
|
|
|
CC: gcc
|
|
CXX: g++
|
|
DEVELOPER_DIR: "/Applications/Xcode-13.3.app/Contents/Developer"
|
|
GIT_CLONE_PATH: "$CI_BUILDS_DIR/vtk-m-ci"
|
|
VTKM_SETTINGS: "64bit_floats+shared+ccache"
|
|
|
|
.cmake_build_macos:
|
|
stage: build
|
|
interruptible: true
|
|
variables:
|
|
CCACHE_BASEDIR: "$CI_PROJECT_DIR"
|
|
CCACHE_DIR: "$CI_PROJECT_DIR/ccache"
|
|
|
|
# -isystem= is not affected by CCACHE_BASEDIR, thus we must ignore it
|
|
CCACHE_IGNOREOPTIONS: "-isystem=*"
|
|
CCACHE_COMPILERCHECK: "content"
|
|
CCACHE_NOHASHDIR: "true"
|
|
CCACHE_RESHARE: "true"
|
|
CCACHE_INSTALL_DIR: "$CI_PROJECT_DIR/.gitlab"
|
|
before_script:
|
|
- .gitlab/ci/config/cmake.sh
|
|
- export PATH=$PWD/.gitlab/cmake/bin:$PATH
|
|
- "cmake -VV -P .gitlab/ci/config/ccache.cmake"
|
|
- export PATH=$PWD/.gitlab/ccache:$PATH
|
|
- "cmake -VV -P .gitlab/ci/config/ninja.cmake"
|
|
- export PATH=$PWD/.gitlab:$PATH
|
|
- "cmake --version"
|
|
- "ccache --version"
|
|
- "ninja --version"
|
|
- "cmake -V -P .gitlab/ci/config/fetch_vtkm_tags.cmake"
|
|
- "cmake -V -P .gitlab/ci/config/gitlab_ci_setup.cmake"
|
|
- "ctest -VV -S .gitlab/ci/ctest_configure.cmake"
|
|
script:
|
|
- "ctest -VV -S .gitlab/ci/ctest_build.cmake"
|
|
after_script:
|
|
- ccache -v -s
|
|
- ccache -z
|
|
extends:
|
|
- .cmake_build_artifacts
|
|
|
|
.cmake_test_macos:
|
|
stage: test
|
|
interruptible: true
|
|
before_script:
|
|
- .gitlab/ci/config/cmake.sh
|
|
- export PATH=.gitlab/cmake/bin:$PATH
|
|
- "cmake -VV -P .gitlab/ci/config/ninja.cmake"
|
|
- export PATH=$PWD/.gitlab:$PATH
|
|
- cmake --version
|
|
- ninja --version
|
|
script:
|
|
- "ctest $CTEST_TIMEOUT -VV -S .gitlab/ci/ctest_test.cmake"
|
|
extends:
|
|
- .cmake_test_artifacts
|
|
|
|
.macos_build_tags:
|
|
tags:
|
|
- vtk-m
|
|
- macos-x86_64
|
|
- xcode-13.3
|
|
- nonconcurrent
|