From 4f7fb0cd57e4772f61de218fed09c35f01a80c12 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Date: Fri, 27 Sep 2024 03:48:37 -0400 Subject: [PATCH] .gitlab-ci.yml: don't build detector --- .gitlab-ci.yml | 11 ++--------- benchmarks/backgrounds/config.yml | 2 +- benchmarks/dis/config.yml | 2 +- benchmarks/dvcs/config.yml | 2 +- benchmarks/dvmp/config.yml | 2 +- benchmarks/tcs/config.yml | 2 +- benchmarks/u_omega/config.yml | 2 +- 7 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbe2c907..69db990a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: RECO: "eicrecon" DETECTOR: epic DETECTOR_CONFIG: epic_craterlake - DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git' workflow: name: '$PIPELINE_NAME' @@ -34,7 +33,6 @@ default: stages: - status-pending - config - - initialize - compile - generate - simulate @@ -80,12 +78,6 @@ common:setup: script: - git clone -b "${COMMON_BENCH_VERSION}" https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git setup - source setup/bin/env.sh && ./setup/bin/install_common.sh - -common:detector: - stage: initialize - needs: ["common:setup"] - script: - - source .local/bin/env.sh && build_detector.sh - mkdir_local_data_link sim_output - mkdir_local_data_link datasets - mkdir -p results @@ -100,9 +92,10 @@ common:detector: .phy_benchmark: needs: - - ["common:detector"] + - ["common:setup"] before_script: - source .local/bin/env.sh + - source /opt/detector/epic-main/setup.sh - ls -lrtha - ln -s "${LOCAL_DATA_PATH}/sim_output" sim_output - ln -s "${LOCAL_DATA_PATH}/datasets/data" data diff --git a/benchmarks/backgrounds/config.yml b/benchmarks/backgrounds/config.yml index 6ba24885..a34e04ed 100644 --- a/benchmarks/backgrounds/config.yml +++ b/benchmarks/backgrounds/config.yml @@ -9,7 +9,7 @@ backgrounds:synchrotron:simulate: extends: .phy_benchmark tags: - s3 - needs: ["common:detector", "backgrounds:compile"] + needs: ["backgrounds:compile"] script: - bash benchmarks/backgrounds/synchrotron.sh --all diff --git a/benchmarks/dis/config.yml b/benchmarks/dis/config.yml index 7afb5b45..b4ae5385 100644 --- a/benchmarks/dis/config.yml +++ b/benchmarks/dis/config.yml @@ -7,7 +7,7 @@ dis:compile: dis:simulate: stage: simulate extends: .phy_benchmark - needs: ["common:detector", "dis:compile"] + needs: ["dis:compile"] parallel: matrix: - EBEAM: 5 diff --git a/benchmarks/dvcs/config.yml b/benchmarks/dvcs/config.yml index 12a1bf69..8040db28 100644 --- a/benchmarks/dvcs/config.yml +++ b/benchmarks/dvcs/config.yml @@ -9,7 +9,7 @@ dvcs:simulate: extends: .phy_benchmark tags: - phy - needs: ["common:detector", "dvcs:compile"] + needs: ["dvcs:compile"] script: #- bash benchmarks/dvcs/dvcs.sh --all - bash benchmarks/dvcs/dvcs.sh --data-init --sim --rec diff --git a/benchmarks/dvmp/config.yml b/benchmarks/dvmp/config.yml index d90a0be9..767e8a2c 100644 --- a/benchmarks/dvmp/config.yml +++ b/benchmarks/dvmp/config.yml @@ -5,7 +5,7 @@ dvmp:compile: - compile_analyses.py dvmp dvmp:generate: - needs: ["common:detector", "dvmp:compile"] + needs: ["dvmp:compile"] image: eicweb.phy.anl.gov:4567/monte_carlo/lager/lager:unstable extends: .phy_benchmark stage: generate diff --git a/benchmarks/tcs/config.yml b/benchmarks/tcs/config.yml index 35cf7153..055a7bf9 100644 --- a/benchmarks/tcs/config.yml +++ b/benchmarks/tcs/config.yml @@ -9,7 +9,7 @@ tcs:simulate: extends: .phy_benchmark tags: - phy - needs: ["common:detector", "tcs:compile"] + needs: ["tcs:compile"] parallel: matrix: - EBEAM: 5 diff --git a/benchmarks/u_omega/config.yml b/benchmarks/u_omega/config.yml index e53ce1a3..4bac8133 100644 --- a/benchmarks/u_omega/config.yml +++ b/benchmarks/u_omega/config.yml @@ -9,7 +9,7 @@ u_omega:simulate: extends: .phy_benchmark tags: - phy - needs: ["common:detector", "u_omega:compile"] + needs: ["u_omega:compile"] script: #- bash benchmarks/u_omega/u_omega.sh --all - bash benchmarks/u_omega/u_omega.sh --data-init --sim --rec -- GitLab