From 5d030746ed348c47892e0308ec376e776c94dce3 Mon Sep 17 00:00:00 2001 From: Olexandr Balyk Date: Sun, 17 Nov 2024 16:26:25 -0600 Subject: [PATCH 1/2] Update GAMS version used in CI (#241) Fixes #242 --------- Co-authored-by: Siddharth Krishna --- .github/workflows/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f9b4ed..2d4c06d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,17 +83,13 @@ jobs: GAMS_LICENSE: ${{ secrets.GAMS_LICENSE }} if: ${{ env.GAMS_LICENSE != '' }} run: | - curl https://d37drm4t2jghv5.cloudfront.net/distributions/44.1.0/linux/linux_x64_64_sfx.exe -o linux_x64_64_sfx.exe + curl https://d37drm4t2jghv5.cloudfront.net/distributions/48.2.0/linux/linux_x64_64_sfx.exe -o linux_x64_64_sfx.exe chmod +x linux_x64_64_sfx.exe mkdir GAMS pushd GAMS ../linux_x64_64_sfx.exe > /dev/null && echo Successfully installed GAMS - export PATH=$PATH:$(pwd)/gams44.1_linux_x64_64_sfx + export PATH=$PATH:$(pwd)/gams48.2_linux_x64_64_sfx popd - echo Creating license file at $HOME/.local/share/GAMS - mkdir -p $HOME/.local/share/GAMS - echo "$GAMS_LICENSE" > $HOME/.local/share/GAMS/gamslice.txt - ls -l $HOME/.local/share/GAMS/ # ---------- Run tool, check for regressions @@ -115,7 +111,7 @@ jobs: # Save the return code to retcode.txt so that the next step can fail the action run: | source .venv/bin/activate - export PATH=$PATH:$GITHUB_WORKSPACE/GAMS/gams44.1_linux_x64_64_sfx + export PATH=$PATH:$GITHUB_WORKSPACE/GAMS/gams48.2_linux_x64_64_sfx (python utils/run_benchmarks.py benchmarks.yml \ --dd --times_dir $GITHUB_WORKSPACE/TIMES_model \ --verbose \ @@ -131,7 +127,6 @@ jobs: # Useful for testing for (CSV) regressions in forks before creating PRs. run: | source .venv/bin/activate - export PATH=$PATH:$GITHUB_WORKSPACE/GAMS/gams44.1_linux_x64_64_sfx (python utils/run_benchmarks.py benchmarks.yml \ --times_dir $GITHUB_WORKSPACE/TIMES_model \ --verbose \ From 4ddec6888dba8089b1a6b7fb6ac7cd715934029a Mon Sep 17 00:00:00 2001 From: Olexandr Balyk Date: Tue, 19 Nov 2024 00:36:02 -0600 Subject: [PATCH 2/2] CI: fix GAMS by fixing TIMES_model path, NZ file structure (#247) Co-authored-by: Siddharth Krishna --- .github/workflows/ci.yml | 3 +-- benchmarks.yml | 56 ++++++++++++++++++++-------------------- setup-benchmarks.sh | 2 +- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d4c06d..f827f5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,7 +113,7 @@ jobs: source .venv/bin/activate export PATH=$PATH:$GITHUB_WORKSPACE/GAMS/gams48.2_linux_x64_64_sfx (python utils/run_benchmarks.py benchmarks.yml \ - --dd --times_dir $GITHUB_WORKSPACE/TIMES_model \ + --dd --times_dir $GITHUB_WORKSPACE/xl2times/TIMES_model \ --verbose \ | tee out.txt; \ echo ${PIPESTATUS[0]} > retcode.txt) @@ -128,7 +128,6 @@ jobs: run: | source .venv/bin/activate (python utils/run_benchmarks.py benchmarks.yml \ - --times_dir $GITHUB_WORKSPACE/TIMES_model \ --verbose \ | tee out.txt; \ echo ${PIPESTATUS[0]} > retcode.txt) diff --git a/benchmarks.yml b/benchmarks.yml index 98e869b..360e314 100644 --- a/benchmarks.yml +++ b/benchmarks.yml @@ -380,20 +380,20 @@ benchmarks: - "SuppXLS/Scen_Cohesive.xlsx" dd_folder: TIMES-NZ-KEA dd_files: - - "base.dd" - - "newtech_elc_kea.dd" - - "newtechs_industry.dd" - - "newtransport-kea.dd" - - "newtech_agr_kea.dd" - - "newtech_rc.dd" - - "trade_parms.dd" - - "syssettings.dd" - - "base_constraints.dd" - - "re_potentials.dd" - - "loadcurve_com-fr.dd" - - "af_renewable.dd" - - "wem_wcm.dd" - - "cohesive.dd" + - "base" + - "newtech_elc_kea" + - "newtechs_industry" + - "newtransport-kea" + - "newtech_agr_kea" + - "newtech_rc" + - "trade_parms" + - "syssettings" + - "base_constraints" + - "re_potentials" + - "loadcurve_com-fr" + - "af_renewable" + - "wem_wcm" + - "cohesive" - name: TIMES-NZ-TUI input_folder: TIMES-NZ inputs: @@ -426,17 +426,17 @@ benchmarks: - "SuppXLS/Scen_Individualistic.xlsx" dd_folder: TIMES-NZ-TUI dd_files: - - "base.dd" - - "newtechs_industry.dd" - - "newtech_elc_tui.dd" - - "newtransport-tui.dd" - - "newtech_agr_tui.dd" - - "newtech_rc.dd" - - "trade_parms.dd" - - "syssettings.dd" - - "base_constraints.dd" - - "re_potentials.dd" - - "loadcurve_com-fr.dd" - - "af_renewable.dd" - - "wem_wcm.dd" - - "individualistic.dd" + - "base" + - "newtechs_industry" + - "newtech_elc_tui" + - "newtransport-tui" + - "newtech_agr_tui" + - "newtech_rc" + - "trade_parms" + - "syssettings" + - "base_constraints" + - "re_potentials" + - "loadcurve_com-fr" + - "af_renewable" + - "wem_wcm" + - "individualistic" diff --git a/setup-benchmarks.sh b/setup-benchmarks.sh index e684223..65793a2 100755 --- a/setup-benchmarks.sh +++ b/setup-benchmarks.sh @@ -10,7 +10,7 @@ REF_demos_xlsx="34a2a5c044cc0bbea1357de50db2f5f02d575181" REF_demos_dd="2848a8a8e2fdcf0cdf7f83eefbdd563b0bb74e86" REF_tim="e820d8002adc6b1526a3bffcc439219b28d0eed5" REF_tim_gams="703f6a4e1d0bedd95c3ebdae534496f3a7e1b7cc" -REF_TIMES_NZ="c83f2d0e51d692cba27a55032c8f8a2a48e4d425" +REF_TIMES_NZ="d6d7b14f43a89ceca7c4e77ba9122a2c757cdae3" # If no GitHub token is provided, try to clone using SSH if [ -z "$GH_PAT_DEMOS_XLSX" ]; then