fix CI for python tests

.gitlab-ci.yml

@@ -116,23 +116,23 @@ distcheck:
 
 
 # python tests
-python-intel-intel:
+python-intel-intel-mpi-openmp:
   tags:
     - python
   artifacts:
     when: on_success
     expire_in: 2 month
   script:
-   - ./ci_test_scripts/run_ci_tests.sh -c "CC=\"mpiicc\" CFLAGS=\"-O3 -xAVX\" FC=\"mpiifort\" FCFLAGS=\"-O3 -xAVX\" SCALAPACK_LDFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP \" SCALAPACK_FCFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP \" --enable-option-checking=fatal --with-mpi=yes --enable-openmp ---disable-gpu --enable-avx --enable-python --enable-python-tests"-j 8 -t 2 -m $MATRIX_SIZE -n $NUMBER_OF_EIGENVECTORS -b $BLOCK_SIZE -s $SKIP_STEP -i $INTERACTIVE_RUN
+   - ./ci_test_scripts/run_ci_tests.sh -c "CC=\"mpiicc\" CFLAGS=\"-O3 -xAVX\" FC=\"mpiifort\" FCFLAGS=\"-O3 -xAVX\" SCALAPACK_LDFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP \" SCALAPACK_FCFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP \" --enable-option-checking=fatal --with-mpi=yes --enable-openmp --disable-gpu --enable-avx --enable-python --enable-python-tests" -j 8 -t 2 -m $MATRIX_SIZE -n $NUMBER_OF_EIGENVECTORS -b $BLOCK_SIZE -s $SKIP_STEP -i $INTERACTIVE_RUN
 
 
 python-distcheck:
   tags:
     - python
   script:
-    - ./configure CC="mpiicc" CFLAGS="-O3 -xAVX" FC="mpiifort" FCFLAGS="-O3 -xAVX" SCALAPACK_LDFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP " SCALAPACK_FCFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP " --enable-option-checking=fatal --with-mpi=yes --enable-openmp ---disable-gpu --enable-avx --enable-python --enable-python-tests" || { cat config.log; exit 1; }
+    - ./configure CC="mpiicc" CFLAGS="-O3 -xAVX" FC="mpiifort" FCFLAGS="-O3 -xAVX" SCALAPACK_LDFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP" SCALAPACK_FCFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP" --enable-option-checking=fatal --with-mpi=yes --enable-openmp --disable-gpu --enable-avx --enable-python --enable-python-tests || { cat config.log; exit 1; }
     # stupid 'make distcheck' leaves behind write-protected files that the stupid gitlab runner cannot remove
-    - make distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-option-checking=fatal --with-mpi=yes --enable-openmp ---disable-gpu --enable-avx --enable-python --enable-python-tests" TASKS=2 TEST_FLAGS="150 50 16" || { chmod u+rwX -R . ; exit 1 ; }
+    - make distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-option-checking=fatal --with-mpi=yes --enable-openmp --disable-gpu --enable-avx --enable-python --enable-python-tests" TASKS=2 TEST_FLAGS="150 50 16" || { chmod u+rwX -R . ; exit 1 ; }
 
 
 # test_project_1stage_legacy_api_gnu

ci_test_scripts/generate_gitlab_ci_tests.py

@@ -342,8 +342,8 @@ python_ci_tests = [
     'SCALAPACK_LDFLAGS=\\"$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP \\" '
     'SCALAPACK_FCFLAGS=\\"$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP \\" '
     '--enable-option-checking=fatal --with-mpi=yes --enable-openmp '
-    '---disable-gpu --enable-avx --enable-python --enable-python-tests'
-    '"-j 8 -t 2 -m $MATRIX_SIZE -n $NUMBER_OF_EIGENVECTORS -b $BLOCK_SIZE '
+    '--disable-gpu --enable-avx --enable-python --enable-python-tests'
+    '" -j 8 -t 2 -m $MATRIX_SIZE -n $NUMBER_OF_EIGENVECTORS -b $BLOCK_SIZE '
     '-s $SKIP_STEP -i $INTERACTIVE_RUN',
     "\n",
     "python-distcheck:",
@@ -353,16 +353,16 @@ python_ci_tests = [
     '    - ./configure '
     'CC="mpiicc" CFLAGS="-O3 -xAVX" '
     'FC="mpiifort" FCFLAGS="-O3 -xAVX" '
-    'SCALAPACK_LDFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP " '
-    'SCALAPACK_FCFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP " '
+    'SCALAPACK_LDFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP" '
+    'SCALAPACK_FCFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP" '
     '--enable-option-checking=fatal --with-mpi=yes --enable-openmp '
-    '---disable-gpu --enable-avx --enable-python --enable-python-tests"'
+    '--disable-gpu --enable-avx --enable-python --enable-python-tests'
     ' || { cat config.log; exit 1; }',
     "    # stupid 'make distcheck' leaves behind write-protected files that "
     "the stupid gitlab runner cannot remove",
     '    - make distcheck DISTCHECK_CONFIGURE_FLAGS="'
     '--enable-option-checking=fatal --with-mpi=yes --enable-openmp '
-    '---disable-gpu --enable-avx --enable-python --enable-python-tests'
+    '--disable-gpu --enable-avx --enable-python --enable-python-tests'
     '" TASKS=2 TEST_FLAGS="150 50 16" || { chmod u+rwX -R . ; exit 1 ; }',
     "\n",
 ]