diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile index f1a8e0936882092be22a5a7901a18b68608d079a..30d2584ebd5d0c1949967867d9015c0182a8a7cd 100644 --- a/.gitlab/Dockerfile +++ b/.gitlab/Dockerfile @@ -17,7 +17,6 @@ RUN apt-get -y upgrade --no-install-recommends \ libblas-dev \ libfftw3-dev \ libfxt-dev \ - libgtg-dev \ liblapack-dev \ liblapacke-dev \ libmetis-dev \ @@ -54,17 +53,17 @@ RUN git clone https://github.com/ecrc/quark && \ cd .. && \ rm quark/ -rf -## Install PARSEC -#RUN git clone https://bitbucket.org/mfaverge/parsec.git && \ -# cd parsec && \ -# git checkout mymaster && \ -# git checkout 6022a61dc96c25f11dd2aeabff2a5b3d7bce867d && \ -# git submodule update && \ -# cmake -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DPARSEC_GPU_WITH_CUDA=OFF -DPARSEC_DIST_WITH_MPI=ON && \ -# cmake --build build -j5 && \ -# cmake --install build && \ -# cd .. && \ -# rm parsec/ -rf +# Install PARSEC +RUN git clone https://bitbucket.org/mfaverge/parsec.git && \ + cd parsec && \ + git checkout mymaster && \ + git checkout 6022a61dc96c25f11dd2aeabff2a5b3d7bce867d && \ + git submodule update && \ + cmake -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DPARSEC_GPU_WITH_CUDA=OFF -DPARSEC_DIST_WITH_MPI=ON && \ + cmake --build build -j5 && \ + cmake --install build && \ + cd .. && \ + rm parsec/ -rf RUN groupadd -f -g 1001 gitlab && \ useradd -u 1001 -g gitlab -ms /bin/bash gitlab && \ diff --git a/modules/find/tests/CMakeLists.txt b/modules/find/tests/CMakeLists.txt index abfbe1ddb16a05018cd908c02d7b4093a51772e4..be03efee77deb2c397504e2fee1f60b847d2c12f 100644 --- a/modules/find/tests/CMakeLists.txt +++ b/modules/find/tests/CMakeLists.txt @@ -125,7 +125,7 @@ if (ENABLE_CTEST) # EZTRACE # not installed yet, we should do it FFTW FXT - GTG + # GTG # parsec build fails with gtg : undefined reference to pajeGetProcFile HWLOC # HYPRE # not installed cf. https://gitlab.inria.fr/solverstack/docker/-/blob/master/dockerfile-distrib LAPACK @@ -138,7 +138,7 @@ if (ENABLE_CTEST) # PAMPA # not compatible with openmpi 4 PAPI PARMETIS - # PARSEC undefined reference to `pajeGetProcFile' on Ubuntu 24.04 + PARSEC PETSC PTSCOTCH QUARK diff --git a/modules/find/tests/run_ctest.sh b/modules/find/tests/run_ctest.sh index 09de848c582aebb5c9b0ad376bc978c8cef4e5d6..67d52c52a8669ab7d697c58c5deea03bc8fb9cbd 100755 --- a/modules/find/tests/run_ctest.sh +++ b/modules/find/tests/run_ctest.sh @@ -4,5 +4,4 @@ cmake -B build -S ./modules/find/tests \ -DENABLE_CTEST=ON \ -DLAPACKE_COMPONENTS="TMG" \ -DQUARK_COMPONENTS="HWLOC" -# -DCMAKE_PREFIX_PATH="$PARSEC_DIR" ctest --test-dir build --no-compress-output --verbose --output-junit report.xml