diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10b2ab9132c3ebecdc1c24611edf0c8d64ce390e..b51cb916ea818c067bf21a86db9f04d6800fa406 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,8 @@ build: - das6 script: - source scripts/load-modules.sh - - source scripts/build-cudawrappers.sh + - mkdir build && cd build + - cmake .. - make -j test-example: @@ -22,10 +23,11 @@ test-example: - build script: - source scripts/load-modules.sh - - source scripts/build-cudawrappers.sh + - mkdir build && cd build + - cmake .. -DBUILD_TESTING=On - make -j - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/libtcc - - build-$(arch)/test/SimpleExample/SimpleExample + - test/SimpleExample/SimpleExample test-correlator: stage: testing @@ -35,8 +37,9 @@ test-correlator: - build script: - source scripts/load-modules.sh - - source scripts/build-cudawrappers.sh + - mkdir build && cd build + - cmake .. -DBUILD_TESTING=On - make -j - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/libtcc - - build-$(arch)/test/CorrelatorTest/CorrelatorTest -n 20 + - test/CorrelatorTest/CorrelatorTest -n 20 diff --git a/scripts/build-cudawrappers.sh b/scripts/build-cudawrappers.sh deleted file mode 100644 index 8b9131eb52789ed4b8f4e1131459e466b75935ff..0000000000000000000000000000000000000000 --- a/scripts/build-cudawrappers.sh +++ /dev/null @@ -1,6 +0,0 @@ -cd external/cuda-wrappers -mkdir build-$(arch) -cd build-$(arch) -cmake -DCMAKE_INSTALL_PREFIX=$(pwd) .. -make install -cd ../../..