From 4614de4cb504bbe022049a3cba4cdc6eb9e32e26 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Mar 2021 13:07:05 +0100 Subject: [PATCH] phase out shell scripts --- .gitlab-ci.yml | 4 ++-- Makefile | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9498a6b43..2a618837f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,7 @@ checkout: - git checkout $CI_COMMIT_SHA - git submodule update --init - source env/DAMASK.sh - - make processing + - ./installation/symlink_Processing.py except: - master - release @@ -224,7 +224,7 @@ SpectralRuntime: script: - module load $IntelCompiler $MPI_Intel $PETSc_Intel - cd $DAMASKROOT - - make clean grid processing OPTIMIZATION=AGGRESSIVE + - make clean grid OPTIMIZATION=AGGRESSIVE - cd $LOCAL_HOME/performance # location of old results - git checkout . # undo any changes (i.e. run time data from non-development branch) - cd $DAMASKROOT/PRIVATE/testing diff --git a/Makefile b/Makefile index 102b954bd..4bc110169 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ SHELL = /bin/sh # Makefile for the installation of DAMASK ######################################################################################## .PHONY: all -all: grid mesh processing +all: grid mesh .PHONY: grid grid: @@ -20,7 +20,3 @@ mesh: .PHONY: clean clean: @rm -rf build - -.PHONY: processing -processing: - @./installation/symlink_Processing.py ${MAKEFLAGS}