From 4dbf5c02515bcce237f39f67f25294482b4ea28d Mon Sep 17 00:00:00 2001
From: Incardona Pietro <incardon@mpi-cbg.de>
Date: Tue, 29 Mar 2022 14:05:02 +0200
Subject: [PATCH] Moving to dockers
---
.gitlab-ci.yml | 172 +++++++++---------
build.sh | 2 +
script/install_HDF5.sh | 2 +-
src/Vector/cuda/vector_dist_gpu_unit_tests.cu | 4 +-
4 files changed, 91 insertions(+), 89 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3748c46a..8cc684c0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,63 +1,63 @@
-#docker_centos_build:
-# stage: build
-# tags:
-# - ubuntu-docker
-# image: 'ubuntu:20.04'
-# artifacts:
-# paths:
-# - ./build/src/pdata
-# - ./build/openfpm_numerics/src/numerics
-# - ./openfpm_numerics/test
-# script:
-# - apt-get update
-# - DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
-# - apt-get -y install cmake wget git g++ gfortran python2 python-is-python3
-# - mkdir -p /root/openfpm_dependencies/openfpm_pdata/base
-# - mkdir /root/.ssh && chmod 700 /root/.ssh
-# - cp id_rsa.pub /root/.ssh/id_rsa.pub && chmod 644 /root/.ssh/id_rsa.pub
-# - cp id_rsa /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa
-# - ssh-keyscan -H git.mpi-cbg.de >> ~/.ssh/known_hosts
-# - pwd
-# - cat base/test_file
-## - ./build.sh $CI_PROJECT_DIR unused pdata 0 base &> out
-# cache:
-# key: $CI_COMMIT_REF_SLUG
-# paths:
-# - base/
+docker_centos_build:
+ stage: build
+ tags:
+ - ubuntu-docker
+ image: 'ubuntu:20.04'
+ artifacts:
+ paths:
+ - ./build/src/pdata
+ - ./build/openfpm_numerics/src/numerics
+ - ./openfpm_numerics/test
+ script:
+ - apt-get update
+ - DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
+ - apt-get -y install cmake wget git g++ gfortran python2 python-is-python3
+ - mkdir -p base
+ - mkdir /root/.ssh && chmod 700 /root/.ssh
+ - cp id_rsa.pub /root/.ssh/id_rsa.pub && chmod 644 /root/.ssh/id_rsa.pub
+ - cp id_rsa /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa
+ - ssh-keyscan -H git.mpi-cbg.de >> ~/.ssh/known_hosts
+ - pwd
+ - cat base/test_file
+ - ./build.sh $CI_PROJECT_DIR unused pdata 0 base &> out
+ cache:
+ key: $CI_COMMIT_REF_SLUG
+ paths:
+ - base/
-centos_build:
- stage: build
- tags:
- - centos
- artifacts:
- paths:
- - ./build/src/pdata
- - ./build/openfpm_numerics/src/numerics
- - ./openfpm_numerics/test
- script:
- - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
+#centos_build:
+# stage: build
+# tags:
+# - centos
+# artifacts:
+# paths:
+# - ./build/src/pdata
+# - ./build/openfpm_numerics/src/numerics
+# - ./openfpm_numerics/test
+# script:
+# - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
-centos_run:
- stage: test
- tags:
- - centos
- dependencies:
- - centos_build
- script:
- - export OMP_NUM_THREADS=1
- - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 2 pdata 0 $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 3 pdata 0 $CI_COMMIT_REF_NAME
- - export OMP_NUM_THREADS=8
- - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
- - export OMP_NUM_THREADS=1
- - cd openfpm_numerics
- - ./run.sh $CI_PROJECT_DIR unused 1 0 0 numerics $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 2 0 0 numerics $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 3 0 0 numerics $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics $CI_COMMIT_REF_NAME
+#centos_run:
+# stage: test
+# tags:
+# - centos
+# dependencies:
+# - centos_build
+# script:
+# - export OMP_NUM_THREADS=1
+# - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 2 pdata 0 $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 3 pdata 0 $CI_COMMIT_REF_NAME
+# - export OMP_NUM_THREADS=8
+# - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
+# - export OMP_NUM_THREADS=1
+# - cd openfpm_numerics
+# - ./run.sh $CI_PROJECT_DIR unused 1 0 0 numerics $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 2 0 0 numerics $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 3 0 0 numerics $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics $CI_COMMIT_REF_NAME
mac_build:
variables:
@@ -85,35 +85,35 @@ mac_run:
- cd openfpm_numerics
- ./run.sh $CI_PROJECT_DIR unused 2 0 0 numerics $CI_COMMIT_REF_NAME
-ubuntu_build:
- stage: build
- tags:
- - ubuntu
- artifacts:
- paths:
- - ./build/src/pdata
- - ./build/openfpm_numerics/src/numerics
- - ./openfpm_numerics/test
- script:
- - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
+#ubuntu_build:
+# stage: build
+# tags:
+# - ubuntu
+# artifacts:
+# paths:
+# - ./build/src/pdata
+# - ./build/openfpm_numerics/src/numerics
+# - ./openfpm_numerics/test
+# script:
+# - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
-ubuntu_run:
- stage: test
- tags:
- - ubuntu
- dependencies:
- - ubuntu_build
- script:
- - export OMP_NUM_THREADS=1
- - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 2 pdata 0 $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 3 pdata 0 $CI_COMMIT_REF_NAME
- - export OMP_NUM_THREADS=8
- - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
- - export OMP_NUM_THREADS=1
- - cd openfpm_numerics
- - ./run.sh $CI_PROJECT_DIR unused 1 0 0 numerics $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 2 0 0 numerics $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 3 0 0 numerics $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics $CI_COMMIT_REF_NAME
+#ubuntu_run:
+# stage: test
+# tags:
+# - ubuntu
+# dependencies:
+# - ubuntu_build
+# script:
+# - export OMP_NUM_THREADS=1
+# - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 2 pdata 0 $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 3 pdata 0 $CI_COMMIT_REF_NAME
+# - export OMP_NUM_THREADS=8
+# - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
+# - export OMP_NUM_THREADS=1
+# - cd openfpm_numerics
+# - ./run.sh $CI_PROJECT_DIR unused 1 0 0 numerics $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 2 0 0 numerics $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 3 0 0 numerics $CI_COMMIT_REF_NAME
+# - ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics $CI_COMMIT_REF_NAME
diff --git a/build.sh b/build.sh
index b19bca395..3e152fad6 100755
--- a/build.sh
+++ b/build.sh
@@ -64,6 +64,8 @@ if [ x"$hostname" == x"falcon1" ]; then
mkdir /projects/ppm/rundeck/openfpm_dependencies_$branch/
dependency_dir=/projects/ppm/rundeck/openfpm_dependencies_$branch/
fi
+elif [ x"$hostname" == x"cifarm-centos-node.mpi-cbg.de" ]; then
+ dependency_dir=base/$branch
else
dependency_dir=$HOME/openfpm_dependencies/openfpm_pdata/$branch
mkdir $HOME/openfpm_dependencies/openfpm_pdata/$branch
diff --git a/script/install_HDF5.sh b/script/install_HDF5.sh
index 6477e1869..c04d71358 100755
--- a/script/install_HDF5.sh
+++ b/script/install_HDF5.sh
@@ -14,7 +14,7 @@ fi
if [ ! -d "$1/ZLIB" -a x"$platform" != x"cygwin" ]; then
rm zlib-1.2.11.tar.gz
rm -rf zlib-1.2.11
- wget https://zlib.net/zlib-1.2.11.tar.gz
+ wget https://zlib.net/fossils/zlib-1.2.11.tar.gz
if [ $? -ne 0 ]; then
echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m"
exit 1
diff --git a/src/Vector/cuda/vector_dist_gpu_unit_tests.cu b/src/Vector/cuda/vector_dist_gpu_unit_tests.cu
index 0dcaed750..1c0a1521d 100644
--- a/src/Vector/cuda/vector_dist_gpu_unit_tests.cu
+++ b/src/Vector/cuda/vector_dist_gpu_unit_tests.cu
@@ -282,7 +282,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_gpu_ghost_get )
template<typename vector_type, typename CellList_type, typename CellList_type_cpu>
void check_cell_list_cpu_and_gpu(vector_type & vd, CellList_type & NN, CellList_type_cpu & NN_cpu)
{
- auto it5 = vd.getDomainIteratorGPU(32);
+ const auto it5 = vd.getDomainIteratorGPU(32);
CUDA_LAUNCH((calculate_force<typename vector_type::stype,decltype(NN.toKernel())>),it5,vd.toKernel(),vd.toKernel_sorted(),NN.toKernel(),create_vcluster().rank());
@@ -391,7 +391,7 @@ void vector_dist_gpu_test_impl()
// now we offload all the properties
- auto it3 = vd.getDomainIteratorGPU();
+ const auto it3 = vd.getDomainIteratorGPU();
// offload to device
vd.hostToDevicePos();
--
GitLab