Fixing CI

fb9e4cdd · Pietro Incardona · 8f8ee77f · fb9e4cdd · fb9e4cdd
Commit fb9e4cdd authored 3 years ago by Pietro Incardona
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-docker_centos_build:
+#docker_centos_build:
-   stage: build
+#   stage: build
-   tags:
+#   tags:
-     - ubuntu-docker
+#     - ubuntu-docker
-   image: 'ubuntu:20.04'
+#   image: 'ubuntu:20.04'
-   artifacts:
+#   artifacts:
-     paths:
+#     paths:
-       - ./build/src/pdata
+#       - ./build/src/pdata
-       - ./build/openfpm_numerics/src/numerics
+#       - ./build/openfpm_numerics/src/numerics
-       - ./openfpm_numerics/test
+#       - ./openfpm_numerics/test
-   script:
+#   script:
-     - apt-get update
+#     - apt-get update
-     - DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
+#     - DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
-     - apt-get -y install cmake wget git g++ gfortran python2  python-is-python3
+#     - apt-get -y install cmake wget git g++ gfortran python2  python-is-python3
-     - mkdir -p /root/openfpm_dependencies/openfpm_pdata/base
+#     - mkdir -p /root/openfpm_dependencies/openfpm_pdata/base
-     - mkdir /root/.ssh && chmod 700 /root/.ssh
+#     - 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.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
+#     - cp id_rsa /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa
-     - ssh-keyscan -H git.mpi-cbg.de >> ~/.ssh/known_hosts
+#     - ssh-keyscan -H git.mpi-cbg.de >> ~/.ssh/known_hosts
-     - pwd
+#     - pwd
-     - cat base/test_file
+#     - cat base/test_file
-#     - ./build.sh $CI_PROJECT_DIR unused pdata 0 base &> out
+##     - ./build.sh $CI_PROJECT_DIR unused pdata 0 base &> out
-   cache:
+#   cache:
-     key: $CI_COMMIT_REF_SLUG
+#     key: $CI_COMMIT_REF_SLUG
-     paths:
+#     paths:
-       - base/
+#       - base/
-#centos_build:
+centos_build:
-#  stage: build
+  stage: build
-#  tags:
+  tags:
-#    - centos
+    - centos
-#  artifacts:
+  artifacts:
-#    paths:
+    paths:
-#      - ./build/src/pdata
+      - ./build/src/pdata
-#      - ./build/openfpm_numerics/src/numerics
+      - ./build/openfpm_numerics/src/numerics
-#      - ./openfpm_numerics/test
+      - ./openfpm_numerics/test
-#  script:
+  script:
-#    - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
+    - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
-#centos_run:
+centos_run:
-#  stage: test
+  stage: test
-#  tags:
+  tags:
-#    - centos
+    - centos
-#  dependencies:
+  dependencies:
-#    - centos_build
+    - centos_build
-#  script:
+  script:
-#    - export OMP_NUM_THREADS=1
+    - export OMP_NUM_THREADS=1
-#    - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
+    - ./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 2 pdata 0 $CI_COMMIT_REF_NAME
-#    - ./run.sh $CI_PROJECT_DIR unused 3 pdata 0 $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 3 pdata 0 $CI_COMMIT_REF_NAME
-#    - export OMP_NUM_THREADS=8
+    - export OMP_NUM_THREADS=8
-#    - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
-#    - export OMP_NUM_THREADS=1
+    - export OMP_NUM_THREADS=1
-#    - cd openfpm_numerics
+    - cd openfpm_numerics
-#    - ./run.sh $CI_PROJECT_DIR unused 1 0 0 numerics $CI_COMMIT_REF_NAME
+    - ./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 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 3 0 0 numerics $CI_COMMIT_REF_NAME
-#    - ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics $CI_COMMIT_REF_NAME
-#mac_build:
+mac_build:
-#  variables:
+  variables:
-#    GIT_STRATEGY: empty
+    GIT_STRATEGY: empty
-#  stage: build
+  stage: build
-#  tags:
+  tags:
-#    - mac
+    - mac
-#  artifacts:
+  artifacts:
-#    paths:
+    paths:
-#      - ./build/src/pdata
+      - ./build/src/pdata
-#      - ./build/openfpm_numerics/src/numerics
+      - ./build/openfpm_numerics/src/numerics
-#      - ./openfpm_numerics/test
+      - ./openfpm_numerics/test
-#  script:
+  script:
-#      - ./build.sh $CI_PROJECT_DIR unused pdata 0  $CI_COMMIT_REF_NAME
+      - ./build.sh $CI_PROJECT_DIR unused pdata 0  $CI_COMMIT_REF_NAME
-#mac_run:
+mac_run:
-#  stage: test
+  stage: test
-#  tags:
+  tags:
-#    - mac
+    - mac
-#  dependencies:
+  dependencies:
-#    - mac_build
+    - mac_build
-#  script:
+  script:
-#    - ./run.sh $CI_PROJECT_DIR unused 1 0 0 $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 1 0 0 $CI_COMMIT_REF_NAME
-#    - ./run.sh $CI_PROJECT_DIR unused 2 0 0 $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 2 0 0 $CI_COMMIT_REF_NAME
-#    - cd openfpm_numerics
+    - cd openfpm_numerics
-#    - ./run.sh $CI_PROJECT_DIR unused 2 0 0 numerics $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 2 0 0 numerics $CI_COMMIT_REF_NAME
-#ubuntu_build:
+ubuntu_build:
-#  stage: build
+  stage: build
-#  tags:
+  tags:
-#    - ubuntu
+    - ubuntu
-#  artifacts:
+  artifacts:
-#    paths:
+    paths:
-#      - ./build/src/pdata
+      - ./build/src/pdata
-#      - ./build/openfpm_numerics/src/numerics
+      - ./build/openfpm_numerics/src/numerics
-#      - ./openfpm_numerics/test
+      - ./openfpm_numerics/test
-#  script:
+  script:
-#    - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
+    - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
-#ubuntu_run:
+ubuntu_run:
-#  stage: test
+  stage: test
-#  tags:
+  tags:
-#    - ubuntu
+    - ubuntu
-#  dependencies:
+  dependencies:
-#    - ubuntu_build
+    - ubuntu_build
-#  script:
+  script:
-#    - export OMP_NUM_THREADS=1
+    - export OMP_NUM_THREADS=1
-#    - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
+    - ./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 2 pdata 0 $CI_COMMIT_REF_NAME
-#    - ./run.sh $CI_PROJECT_DIR unused 3 pdata 0 $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 3 pdata 0 $CI_COMMIT_REF_NAME
-#    - export OMP_NUM_THREADS=8
+    - export OMP_NUM_THREADS=8
-#    - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 1 pdata 0 $CI_COMMIT_REF_NAME
-#    - export OMP_NUM_THREADS=1
+    - export OMP_NUM_THREADS=1
-#    - cd openfpm_numerics
+    - cd openfpm_numerics
-#    - ./run.sh $CI_PROJECT_DIR unused 1 0 0 numerics $CI_COMMIT_REF_NAME
+    - ./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 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 3 0 0 numerics $CI_COMMIT_REF_NAME
-#    - ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics $CI_COMMIT_REF_NAME
+    - ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics $CI_COMMIT_REF_NAME
--- a/example/Vector/0_simple/main.cpp
+++ b/example/Vector/0_simple/main.cpp
@@ -68,9 +68,6 @@
 int main(int argc, char* argv[])
 {
-	std::cout << is_layout_inte<memory_traits_custom_separation_of_buffer<aggregate<int>>>::value << std::endl;
 	/*!
 	 * \page Vector_0_simple Vector 0 simple
 	 *