using new names

This commit is contained in:
Martin Diehl 2020-11-27 23:12:54 +01:00
parent a8da1e5ed9
commit 60f9cb704f
1 changed files with 12 additions and 12 deletions

View File

@ -54,17 +54,17 @@ variables:
IntelCompiler: "$IntelCompiler19_1" IntelCompiler: "$IntelCompiler19_1"
GNUCompiler: "$GNUCompiler10" GNUCompiler: "$GNUCompiler10"
# ++++++++++++ MPI ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++ MPI ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
IMPI2020Intel19_1: "MPI/Intel/19.1/IntelMPI/2020" IMPI2020Intel19_1: "MPI/Intel/19.1.2/IntelMPI/2019"
OMPI4_0GNU10: "MPI/GNU/10/OpenMPI/4.0.5" OMPI4_0GNU10: "MPI/GNU/10/OpenMPI/4.0.5"
# ------------ Defaults ---------------------------------------------- # ------------ Defaults ----------------------------------------------
MPI_Intel: "$IMPI2020Intel19_1" MPI_Intel: "$IMPI2020Intel19_1"
MPI_GNU: "$OMPI4_0GNU10" MPI_GNU: "$OMPI4_0GNU10"
# ++++++++++++ PETSc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++ PETSc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
PETSc3_14_0IMPI2020Intel19_1: "Libraries/PETSc/3.14.0/Intel-19.1-IntelMPI-2020" PETSc3_14_0IMPI2020Intel19_1: "Libraries/PETSc/3.14.0/Intel-19.1.2-IntelMPI-2019"
PETSc3_14_0OMPI4_0GNU10: "Libraries/PETSc/3.14.0/GNU-10-OpenMPI-4.0.5" PETSc3_14_0OMPI4_0GNU10: "Libraries/PETSc/3.14.0/GNU-10-OpenMPI-4.0.5"
# ------------ Defaults ---------------------------------------------- # ------------ Defaults ----------------------------------------------
PETSc_MPICH_Intel: "$PETSc3_14_0IMPI2020Intel19_1" PETSc_Intel: "$PETSc3_14_0IMPI2020Intel19_1"
PETSc_MPICH_GNU: "$PETSc3_14_0OMPI4_0GNU10" PETSc_GNU: "$PETSc3_14_0OMPI4_0GNU10"
# ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
MSC2020: "FEM/MSC/2020" MSC2020: "FEM/MSC/2020"
# ------------ Defaults ---------------------------------------------- # ------------ Defaults ----------------------------------------------
@ -180,7 +180,7 @@ Post_OrientationAverageMisorientation:
compile_grid_Intel: compile_grid_Intel:
stage: compile stage: compile
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- cd pytest - cd pytest
- pytest -k 'compile and grid' --basetemp=${TESTROOT}/compile_grid_Intel - pytest -k 'compile and grid' --basetemp=${TESTROOT}/compile_grid_Intel
except: except:
@ -190,7 +190,7 @@ compile_grid_Intel:
compile_mesh_Intel: compile_mesh_Intel:
stage: compile stage: compile
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- cd pytest - cd pytest
- pytest -k 'compile and mesh' --basetemp=${TESTROOT}/compile_mesh_Intel - pytest -k 'compile and mesh' --basetemp=${TESTROOT}/compile_mesh_Intel
except: except:
@ -200,7 +200,7 @@ compile_mesh_Intel:
compile_grid_GNU: compile_grid_GNU:
stage: compile stage: compile
script: script:
- module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU - module load $GNUCompiler $MPI_GNU $PETSc_GNU
- cd pytest - cd pytest
- pytest -k 'compile and grid' --basetemp=${TESTROOT}/compile_grid_GNU - pytest -k 'compile and grid' --basetemp=${TESTROOT}/compile_grid_GNU
except: except:
@ -210,7 +210,7 @@ compile_grid_GNU:
compile_mesh_GNU: compile_mesh_GNU:
stage: compile stage: compile
script: script:
- module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU - module load $GNUCompiler $MPI_GNU $PETSc_GNU
- cd pytest - cd pytest
- pytest -k 'compile and mesh' --basetemp=${TESTROOT}/compile_mesh_GNU - pytest -k 'compile and mesh' --basetemp=${TESTROOT}/compile_mesh_GNU
except: except:
@ -230,7 +230,7 @@ compile_MARC:
setup_grid: setup_grid:
stage: compile stage: compile
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- BUILD_DIR=$(mktemp -d) - BUILD_DIR=$(mktemp -d)
- cd ${BUILD_DIR} - cd ${BUILD_DIR}
- cmake -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASKROOT} ${DAMASKROOT} - cmake -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASKROOT} ${DAMASKROOT}
@ -242,7 +242,7 @@ setup_grid:
setup_mesh: setup_mesh:
stage: compile stage: compile
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- BUILD_DIR=$(mktemp -d) - BUILD_DIR=$(mktemp -d)
- cd ${BUILD_DIR} - cd ${BUILD_DIR}
- cmake -DDAMASK_SOLVER=MESH -DCMAKE_INSTALL_PREFIX=${DAMASKROOT} ${DAMASKROOT} - cmake -DDAMASK_SOLVER=MESH -DCMAKE_INSTALL_PREFIX=${DAMASKROOT} ${DAMASKROOT}
@ -255,7 +255,7 @@ setup_mesh:
Pytest_grid: Pytest_grid:
stage: grid stage: grid
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- cd pytest - cd pytest
- pytest -k 'not compile' --basetemp=${TESTROOT}/fortran -v - pytest -k 'not compile' --basetemp=${TESTROOT}/fortran -v
except: except:
@ -341,7 +341,7 @@ Marc_elementLib:
SpectralRuntime: SpectralRuntime:
stage: performance stage: performance
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- cd $DAMASKROOT - cd $DAMASKROOT
- make clean grid processing OPTIMIZATION=AGGRESSIVE - make clean grid processing OPTIMIZATION=AGGRESSIVE
- cd $LOCAL_HOME/performance # location of old results - cd $LOCAL_HOME/performance # location of old results