Skip to content

Commit

Permalink
added small fixes for zfp testing, new gitlab CI functionality
Browse files Browse the repository at this point in the history
  • Loading branch information
GarrettDMorrison committed Dec 1, 2020
1 parent 74364a8 commit 1829523
Show file tree
Hide file tree
Showing 3 changed files with 105 additions and 20 deletions.
82 changes: 82 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
variables:
GIT_SUBMODULE_STRATEGY: recursive
LLNL_SLURM_SCHEDULER_PARAMETERS: "--nodes=1 -p pbatch -A asccasc"

stages:
- build
- test


###########
# GCC CPU #
###########

build_cpu-linux_gcc6.1.0:
stage: build
before_script:
- module reset
- module load gcc/6.1.0
- export CXX=$(which g++)
- |-
if [ -z ${CXX} ]; then
exit 1
fi
script:
- mkdir build
- cd build
- cmake -DBUILD_TESTING=ON -DZFP_WITH_CUDA=OFF -DBUILD_UTILITIES=OFF ..
- make -j
artifacts:
paths:
- build
tags:
- batch
- surface

test_cpu-linux_gcc6.1.0:
stage: test
script:
- cd build
- ctest -E "Cuda"
after_script:
- rm -rf build
dependencies:
- build_cpu-linux_gcc6.1.0
tags:
- batch
- surface

##############
# NVIDIA GPU #
##############

build_gpu-linux_cuda10.1.168:
stage: build
before_script:
- module reset
- module load opt
- module load cuda/10.1.168
script:
- mkdir build
- cd build
- cmake -DBUILD_TESTING=ON -DZFP_WITH_CUDA=ON -DZFP_WITH_OPENMP=OFF -DBUILD_UTILITIES=OFF ..
- make -j
artifacts:
paths:
- build
tags:
- batch
- surface

test_gpu-linux_cuda10.1.168:
stage: test
script:
- cd build
- ctest -R "Cuda"
after_script:
- rm -rf build
dependencies:
- build_gpu-linux_cuda10.1.168
tags:
- batch
- surface
3 changes: 3 additions & 0 deletions CTestConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "open.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=zfp")
set(CTEST_DROP_SITE_CDASH TRUE)

# Test Options
set(MEMORYCHECK_COMMAND_OPTIONS "--show-reachable=no")
40 changes: 20 additions & 20 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,6 @@ version: 0.5.5-{build}
environment:
# zfpy only build for Release builds (otherwise need debug python libs python27_d.lib)
matrix:
- COMPILER: mingw
GENERATOR: MinGW Makefiles
PLATFORM: Win32
BUILD_TYPE: Debug

- COMPILER: mingw
GENERATOR: MinGW Makefiles
PLATFORM: Win32
BUILD_TYPE: Release

- COMPILER: mingw-w64
GENERATOR: MinGW Makefiles
PLATFORM: x64
BUILD_TYPE: Debug

- COMPILER: mingw-w64
GENERATOR: MinGW Makefiles
PLATFORM: x64
BUILD_TYPE: Release

- COMPILER: msvc
GENERATOR: Visual Studio 15 2017 Win64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
Expand Down Expand Up @@ -71,6 +51,26 @@ environment:
BUILD_TYPE: Release
PYTHON_VERSION: 27

- COMPILER: mingw
GENERATOR: MinGW Makefiles
PLATFORM: Win32
BUILD_TYPE: Debug

- COMPILER: mingw
GENERATOR: MinGW Makefiles
PLATFORM: Win32
BUILD_TYPE: Release

- COMPILER: mingw-w64
GENERATOR: MinGW Makefiles
PLATFORM: x64
BUILD_TYPE: Debug

- COMPILER: mingw-w64
GENERATOR: MinGW Makefiles
PLATFORM: x64
BUILD_TYPE: Release

install:
- if "%COMPILER%"=="mingw" set PATH=C:\MinGW\bin;%PATH%
- if "%COMPILER%"=="mingw-w64" set PATH=C:\MinGW\bin;%PATH%
Expand Down

0 comments on commit 1829523

Please sign in to comment.