From b6fbd768d1fd250d5de1f35e7a78a7809f81c4d6 Mon Sep 17 00:00:00 2001 From: BenWeber42 Date: Tue, 28 May 2024 16:11:47 +0200 Subject: [PATCH 1/2] Removed GCC 13 from Pace CI (#1575) Fixes various smaller issues of the Pace CI: - Removed installation command for non-existent `gcc-13` package - Adds Pace CI to merge queue (see: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue#triggering-merge-group-checks-with-github-actions) - Adds `apt-get update` before `apt-get install` - Adds `-y` flag to `apt-get install` --- .github/workflows/pyFV3-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyFV3-ci.yml b/.github/workflows/pyFV3-ci.yml index f50f424bb8..2b98327381 100644 --- a/.github/workflows/pyFV3-ci.yml +++ b/.github/workflows/pyFV3-ci.yml @@ -5,6 +5,8 @@ on: branches: [ master, ci-fix ] pull_request: branches: [ master, ci-fix ] + merge_group: + branches: [ master, ci-fix ] defaults: run: @@ -35,8 +37,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install library dependencies run: | - sudo apt-get install libopenmpi-dev libboost-all-dev gcc-13 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13 + sudo apt-get update + sudo apt-get install -y libopenmpi-dev libboost-all-dev gcc --version # Because Github doesn't allow us to do a git checkout in code # we use a trick to checkout DaCe first (not using the external submodule) From 72147393d3b39477723f7b368ca3dfcc9bf22e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= <147368808+philip-paul-mueller@users.noreply.github.com> Date: Wed, 29 May 2024 09:39:33 +0200 Subject: [PATCH 2/2] `SDFG.save()` now performs tilde expansion. (#1578) I noticed that it would be cool if I could write `sdfg.save("~/tmp/faulty.sdfg")` and it would save it into my home directory, instead in a directory `./~` in some random directory. --- dace/sdfg/sdfg.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dace/sdfg/sdfg.py b/dace/sdfg/sdfg.py index f10e728607..b43ff2a7bf 100644 --- a/dace/sdfg/sdfg.py +++ b/dace/sdfg/sdfg.py @@ -1520,6 +1520,8 @@ def save(self, filename: str, use_pickle=False, hash=None, exception=None, compr :param compress: If True, uses gzip to compress the file upon saving. :return: The hash of the SDFG, or None if failed/not requested. """ + filename = os.path.expanduser(filename) + if compress: fileopen = lambda file, mode: gzip.open(file, mode + 't') else: