Update pipeline to test outputs and 48 case with OpenMP

.gitlab-ci.yml

@@ -154,7 +154,7 @@ building_stage:
       - cat /etc/os-release
       - cd build
       - echo "Configuring with default compilers (MAGMA disabled)..."
-      - ./configure --without-magma --without-cublas --disable-offload --enable-refinement
+      - ./configure --without-magma --without-cublas --disable-offload --enable-refinement --enable-shared
       - make wipe
       - echo "Building the default configuration..."
       - make -j
@@ -185,7 +185,9 @@ sanity_stage:
       - hostname
       - echo $CI_COMMIT_SHA
       - echo $CI_COMMIT_BRANCH
-      - cd build/testing
+      - cd build/libnptm
+      - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH;$PWD"
+      - cd ../testing
       - echo "Running memory sanity check for ParticleDescriptor"
       - chmod +x test_ParticleDescriptor
       - valgrind --leak-check=full --log-file=valgrind.log ./test_ParticleDescriptor
@@ -195,6 +197,7 @@ sanity_stage:
       - rm valgrind.log
       - valgrind --leak-check=full --log-file=valgrind.log ./test_outputs
       - grep "0 errors from 0 contexts" valgrind.log
+      - rm -rf c_OCLU_24
       
 running_stage:
    stage: run
@@ -220,7 +223,9 @@ running_stage:
       - hostname
       - echo $CI_COMMIT_SHA
       - echo $CI_COMMIT_BRANCH
-      - cd build/sphere
+      - cd build/libnptm
+      - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH;$PWD"
+      - cd ../sphere
       - echo "Running np_sphere"
       - chmod +x np_sphere
       - ./np_sphere
@@ -245,7 +250,7 @@ testing_stage:
       - running_stage
    artifacts:
       paths:
-         - build/cluster/pycompare.html
+         - build/cluster/pycompare_*.html
          - build/inclusion/pycompare.html
          - build/sphere/pycompare.html
       exclude:
@@ -258,7 +263,9 @@ testing_stage:
       - hostname
       - echo $CI_COMMIT_SHA
       - echo $CI_COMMIT_BRANCH
-      - cd build/sphere
+      - cd build/libnptm
+      - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH;$PWD"
+      - cd ../sphere
       - export FFILE=../../test_data/sphere/OSPH
       - echo "Comparing output of SPHERE"
       - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OSPH --html
@@ -271,13 +278,26 @@ testing_stage:
       - cd ../cluster
       - echo "Comparing output of CLUSTER"
       - export FFILE=../../test_data/cluster/OCLU
-      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU --html
+      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU --html=pycompare_dev.html
       - echo "Testing cluster with 24 spheres"
       - OMP_NUM_THREADS=1 OMPI_ALLOW_RUN_AS_ROOT=1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 mpirun -n 2 ./np_cluster ../../test_data/cluster/DEDFB_24 ../../test_data/cluster/DCLU_24 .
       - echo "Comparing output of CLUSTER with 24 spheres"
       - export FFILE=../../test_data/cluster/OCLU_24
-      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU --html
+      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU --html=pycompare_24.html
       - echo "Checking consistency among legacy and HDF5 configuration files"
       - ../testing/test_TEDF ../../test_data/cluster/DEDFB_24 c_TEDF c_TEDF.hd5
       - echo "Checking consistency among legacy and HDF5 TM files"
       - ../testing/test_TTMS c_TTMS c_TTMS.hd5
+      - echo "Testing cluster with 48 spheres"
+      - OMP_NUM_THREADS=5 ./np_cluster ../../test_data/cluster/DEDFB_48 ../../test_data/cluster/DCLU_48 .
+      - echo "Comparing output of CLUSTER with 48 spheres"
+      - export FFILE=../../test_data/cluster/OCLU_48
+      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU --html=pycompare_48.html
+      - cd ../testing
+      - echo "Checking consistency of HDF5 output"
+      - chmod u+x test_outputs
+      - ./test_outputs
+      - export FFILE=../../test_data/cluster/OCLU_24
+      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU_24
+      - rm -rf c_OCLU_24
+      
\ No newline at end of file