From 383a2f1469924f74a34d6159e4b90dbe25c21f1d Mon Sep 17 00:00:00 2001 From: yuqisun <7748145+yuqisun@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:10:35 +0800 Subject: [PATCH 1/8] Enable Py3.9 and Py3.12 All Py3.7, Py3.9 and Py3.12 work. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c58747c..1f0b2d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7.13"] + python-version: ["3.7.13", "3.9.20", "3.12.8"] steps: - uses: actions/checkout@v3 From d452bb2cd8a7a125209019cba3f3d4ff4a72c668 Mon Sep 17 00:00:00 2001 From: yuqisun <7748145+yuqisun@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:28:14 +0800 Subject: [PATCH 2/8] Resolve unknown hook issue. Refer to https://github.com/tancheng/VectorCGRA/pull/38 and https://github.com/tancheng/pymtl3.1/pull/1 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f0b2d2..b7e604f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,7 +75,7 @@ jobs: source ${HOME}/venv/bin/activate pip install py==1.11.0 pip install wheel - pip install git+https://github.com/tancheng/pymtl3.git + pip install -U git+https://github.com/tancheng/pymtl3.1@yo-struct-list-fix pip install hypothesis pip install pytest pip list From 4778e5239603f2a556b3d128326f14cb5b3be7a5 Mon Sep 17 00:00:00 2001 From: Yuqi Sun <791079835@qq.com> Date: Fri, 13 Dec 2024 16:47:19 +0800 Subject: [PATCH 3/8] Enable Py3.9 and Py3.12 - use latest VectorCGRA --- VectorCGRA | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VectorCGRA b/VectorCGRA index 4085877..1594f83 160000 --- a/VectorCGRA +++ b/VectorCGRA @@ -1 +1 @@ -Subproject commit 40858770a221edb369cc03e72f5f133360a896be +Subproject commit 1594f83ffaddba9df0462ac10d56f9d552e33dcf From 29e6ad3d218adcac1df1daaddb82ae12ef9b9609 Mon Sep 17 00:00:00 2001 From: Yuqi Sun <791079835@qq.com> Date: Fri, 13 Dec 2024 17:45:32 +0800 Subject: [PATCH 4/8] Enable Py3.9 and Py3.12 - use latest VectorCGRA --- VectorCGRA | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VectorCGRA b/VectorCGRA index 1594f83..352cb9b 160000 --- a/VectorCGRA +++ b/VectorCGRA @@ -1 +1 @@ -Subproject commit 1594f83ffaddba9df0462ac10d56f9d552e33dcf +Subproject commit 352cb9be75ee4fd7294d110ba4d0bf6f855198e6 From dd25d494182b80bce4f777ab76045dc27597c141 Mon Sep 17 00:00:00 2001 From: Yuqi Sun <791079835@qq.com> Date: Fri, 13 Dec 2024 17:54:50 +0800 Subject: [PATCH 5/8] Enable Py3.9 and Py3.12 - use latest VectorCGRA --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b7e604f..de5e63b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -85,7 +85,7 @@ jobs: cd VectorCGRA mkdir -p build && cd build source ${HOME}/venv/bin/activate - pytest ../cgra/ -v --tb=short + pytest .. -v --tb=short - name: Install dependencies for mflowgen From c789aecb9c37d13ce6fc9204a7238258932dda26 Mon Sep 17 00:00:00 2001 From: Yuqi Sun <791079835@qq.com> Date: Fri, 13 Dec 2024 18:20:16 +0800 Subject: [PATCH 6/8] Test with submodules. --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de5e63b..f60acd8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,6 +23,8 @@ jobs: steps: - uses: actions/checkout@v3 + with: + submodules: true # Update references - name: Git Sumbodule Update From 0dcc8fc9b940b8871b38fadfa2d35875851f339e Mon Sep 17 00:00:00 2001 From: Yuqi Sun <791079835@qq.com> Date: Fri, 13 Dec 2024 18:25:49 +0800 Subject: [PATCH 7/8] Test with submodules. --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f60acd8..d8169c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,10 +81,12 @@ jobs: pip install hypothesis pip install pytest pip list - - - name: Test with pytest for VectorCGRA + - name: VectorCGRA Git Sumbodule Update run: | cd VectorCGRA + git submodule update --init + - name: Test with pytest for VectorCGRA + run: | mkdir -p build && cd build source ${HOME}/venv/bin/activate pytest .. -v --tb=short From 797d762a6eaf84c0c9ef292f52afde969120692a Mon Sep 17 00:00:00 2001 From: Yuqi Sun <791079835@qq.com> Date: Fri, 13 Dec 2024 18:30:23 +0800 Subject: [PATCH 8/8] Test with submodules. --- .github/workflows/main.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8169c5..c9d9587 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,8 +53,10 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - + - name: VectorCGRA Git Sumbodule Update + run: | + cd VectorCGRA + git submodule update --init - name: Install Verilator for VectorCGRA run: | wget https://github.com/tancheng/pymtl-verilator/raw/master/verilator-travis-4.036.tar.gz @@ -81,12 +83,9 @@ jobs: pip install hypothesis pip install pytest pip list - - name: VectorCGRA Git Sumbodule Update - run: | - cd VectorCGRA - git submodule update --init - name: Test with pytest for VectorCGRA run: | + cd VectorCGRA mkdir -p build && cd build source ${HOME}/venv/bin/activate pytest .. -v --tb=short