From b9f87f75405dd45a93863bcc7c2efb22a7ac5b25 Mon Sep 17 00:00:00 2001
From: Bram Veenboer <bram.veenboer@gmail.com>
Date: Thu, 10 Aug 2023 10:45:18 +0200
Subject: [PATCH] Update CI
---
.gitlab-ci.yml | 13 ++++++++-----
scripts/build-cudawrappers.sh | 6 ------
2 files changed, 8 insertions(+), 11 deletions(-)
delete mode 100644 scripts/build-cudawrappers.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10b2ab9..b51cb91 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 8b9131e..0000000
--- 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 ../../..
--
GitLab