From 0f9d2241fa2749f5362f6c41dd932f6bb4a9de16 Mon Sep 17 00:00:00 2001
From: Augustin Degomme <adegomme@gmail.com>
Date: Mon, 13 Sep 2021 18:17:40 +0200
Subject: [PATCH] new attempt for bigdft .. it fails on my local system and I
 have no idea why, so let's see if this is a local issue.

---
 tools/jenkins/ci-bigdft.sh        | 14 ++++++--------
 tools/jenkins/gfortran-simgrid.rc |  9 +++------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/tools/jenkins/ci-bigdft.sh b/tools/jenkins/ci-bigdft.sh
index 95dd27ca3e..5199a4a9fb 100755
--- a/tools/jenkins/ci-bigdft.sh
+++ b/tools/jenkins/ci-bigdft.sh
@@ -1,24 +1,22 @@
 #!/usr/bin/env sh
 set -ex
 export OMP_NUM_THREADS=1
-
 SUDO="" # to ease the local testing
 $SUDO apt-get -y update
-$SUDO apt-get -y install git
-$SUDO apt-get -y install build-essential
-$SUDO apt-get -y install python-is-python3
-$SUDO apt-get -y install python3-six
-$SUDO apt-get -y install jhbuild
+$SUDO apt-get -y install git build-essential gfortran python-is-python3 python3-six python3-distutils automake cmake libboost-dev libblas-dev liblapack-dev wget
 
 git clone --depth=1 https://gitlab.com/l_sim/bigdft-suite.git
 cd bigdft-suite
 
 WORKSPACE=`pwd`
 mkdir build && cd build
+export PATH=$PWD/simgrid-dev/smpi_script/bin/:$PATH
+export LD_LIBRARY_PATH=$PWD/simgrid-dev/lib/:$LD_LIBRARY_PATH
+export JHBUILD_RUN_AS_ROOT=1
 
-JHBUILD_RUN_AS_ROOT=1 ../Installer.py autogen -y
+../Installer.py autogen -y
 
-JHBUILD_RUN_AS_ROOT=1 ../Installer.py -f ../../tools/jenkins/gfortran-simgrid.rc -y build
+../Installer.py -f ../../tools/jenkins/gfortran-simgrid.rc -y build
 
 #cubic version
 cd ../bigdft/tests/DFT/cubic/C
diff --git a/tools/jenkins/gfortran-simgrid.rc b/tools/jenkins/gfortran-simgrid.rc
index 103b546839..70c55d8c63 100644
--- a/tools/jenkins/gfortran-simgrid.rc
+++ b/tools/jenkins/gfortran-simgrid.rc
@@ -3,15 +3,16 @@
 def getcwd():
   import os
   return os.getcwd()
+prefix=getcwd()+"/install"
 #Add the condition testing to run tests and includes PyYaml
 conditions.add("testing")
 conditions.add("simulation") #to include simgrid compilation
-#conditions.add("python")
 #List the module the this rcfile will build
 modules = ['spred',]
 #example of the potentialities of the python syntax in this file
 def env_configuration():
-    return  """ "FCFLAGS=-O2 -fPIC -fopenmp" "CFLAGS=-fPIC -O2 -fopenmp" "FC=mpif90" "F77=mpif77" "FCLIBS= " "LIBS=-ldl -lstdc++ -lgfortran"  """
+    return """--host=x86_64-linux-gnu 'FCFLAGS=-O2 -std=legacy -fopenmp -g -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow,denormal -Wall -fPIC' 'CFLAGS=-O2 -fopenmp -fPIC' 'LDFLAGS=-fopenmp -fPIC' --with-mpi3=false"""
+
 #the following command sets the environment variable to give these settings
 #to all the modules
 import os
@@ -24,8 +25,4 @@ module_autogenargs.update({
     " --enable-simgrid-shared --with-mpi-libs='-lsimgrid' --with-mpi-include=-I"+getcwd()+"/install/include/smpi FC="+getcwd()+"/install/bin/smpif90 CC=gcc SIMGRID_FC="+getcwd()+"/install/bin/smpif90",
 'bigdft': env_configuration()+
     " --enable-simgrid-shared --with-mpi-libs='-lsimgrid' --with-mpi-include=-I"+getcwd()+"/install/include/smpi FC="+getcwd()+"/install/bin/smpif90 CC=gcc SIMGRID_FC="+getcwd()+"/install/bin/smpif90",
-'spred': env_configuration()+" --with-gobject=yes ",
-'PyYAML': "build_ext -I%(prefix)s/include -L%(prefix)s/lib --rpath=%(prefix)s/lib " % {"prefix": prefix},
-'pygobject': 'PYTHON=/usr/bin/python',
-'v_sim-dev': '--with-abinit --with-archives --with-openbabel --with-cube --without-strict-cflags'
 })
-- 
2.20.1