From 4c63b8d78891e95ccb7f3c74d1e361b2ca00d3bb Mon Sep 17 00:00:00 2001 From: Karl W Schulz Date: Fri, 17 Nov 2023 11:29:25 -0600 Subject: [PATCH 1/5] add a requirements-test.txt file to organize additional python packages needed to support testing; update CI to install python packages from dependency files Signed-off-by: Karl W Schulz --- .github/workflows/mi100.yml | 8 +++++--- requirements-test.txt | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 requirements-test.txt diff --git a/.github/workflows/mi100.yml b/.github/workflows/mi100.yml index bfe1ed253..5cc5d5117 100644 --- a/.github/workflows/mi100.yml +++ b/.github/workflows/mi100.yml @@ -18,21 +18,23 @@ jobs: runs-on: [mi100, rhel9] env: TEST_DIR: ${RUNNER_TEMP}/omniperf - PYTHONPATH: /share/sw/omniperf/python-libs + PYTHONPATH: ${RUNNER_TEMP}/python-libs steps: - name: Checkout uses: actions/checkout@v3 with: submodules: recursive token: ${{ secrets.GH_PAT }} + - name: Install Python collateral (build and test) + run: | + pip3 install -t ${PYTHONPATH} requirements.txt + pip3 install -t ${PYTHONPATH} requirements-test.txt - name: Configure run: | mkdir build cd build ml cmake cmake -DENABLE_COVERAGE=ON .. - - name: Install Python testing collateral - run: pip3 install pytest pytest-cov mock - name: Create HIP binary (vcopy) run: hipcc -o tests/vcopy ./sample/vcopy.cpp - name: Run [profile] mode diff --git a/requirements-test.txt b/requirements-test.txt new file mode 100644 index 000000000..27054f258 --- /dev/null +++ b/requirements-test.txt @@ -0,0 +1,3 @@ +mock +pytest +pytest-cov From e03de9ec29780bb5e5570ccab128a16be3b47f4b Mon Sep 17 00:00:00 2001 From: Karl W Schulz Date: Fri, 17 Nov 2023 11:32:02 -0600 Subject: [PATCH 2/5] fix yaml syntax Signed-off-by: Karl W Schulz --- .github/workflows/mi100.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mi100.yml b/.github/workflows/mi100.yml index 5cc5d5117..740401d6e 100644 --- a/.github/workflows/mi100.yml +++ b/.github/workflows/mi100.yml @@ -27,8 +27,8 @@ jobs: token: ${{ secrets.GH_PAT }} - name: Install Python collateral (build and test) run: | - pip3 install -t ${PYTHONPATH} requirements.txt - pip3 install -t ${PYTHONPATH} requirements-test.txt + pip3 install -t ${PYTHONPATH} requirements.txt + pip3 install -t ${PYTHONPATH} requirements-test.txt - name: Configure run: | mkdir build From d4df962fad7610919214d4b3c2d98a3fa786ce33 Mon Sep 17 00:00:00 2001 From: Karl W Schulz Date: Fri, 17 Nov 2023 11:46:38 -0600 Subject: [PATCH 3/5] add missing requirements flag Signed-off-by: Karl W Schulz --- .github/workflows/mi100.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mi100.yml b/.github/workflows/mi100.yml index 740401d6e..e84fe739f 100644 --- a/.github/workflows/mi100.yml +++ b/.github/workflows/mi100.yml @@ -27,8 +27,8 @@ jobs: token: ${{ secrets.GH_PAT }} - name: Install Python collateral (build and test) run: | - pip3 install -t ${PYTHONPATH} requirements.txt - pip3 install -t ${PYTHONPATH} requirements-test.txt + pip3 install -t ${PYTHONPATH} -r requirements.txt + pip3 install -t ${PYTHONPATH} -r requirements-test.txt - name: Configure run: | mkdir build From 7ea57055f6beea077c666e4bb78ca0c77d322de6 Mon Sep 17 00:00:00 2001 From: Karl W Schulz Date: Fri, 17 Nov 2023 12:09:03 -0600 Subject: [PATCH 4/5] wip Signed-off-by: Karl W Schulz --- .github/workflows/mi100.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mi100.yml b/.github/workflows/mi100.yml index e84fe739f..433e40f49 100644 --- a/.github/workflows/mi100.yml +++ b/.github/workflows/mi100.yml @@ -17,14 +17,15 @@ jobs: build: runs-on: [mi100, rhel9] env: - TEST_DIR: ${RUNNER_TEMP}/omniperf - PYTHONPATH: ${RUNNER_TEMP}/python-libs + PYTHONPATH: "$GITHUB_WORKSPACE/python-libs" steps: - name: Checkout uses: actions/checkout@v3 with: submodules: recursive token: ${{ secrets.GH_PAT }} + - name: pythonpath + run: echo ${PYTHONPATH} - name: Install Python collateral (build and test) run: | pip3 install -t ${PYTHONPATH} -r requirements.txt From 4ead87f4c5843896adb6d27158302f1fba695914 Mon Sep 17 00:00:00 2001 From: Karl W Schulz Date: Fri, 17 Nov 2023 12:15:02 -0600 Subject: [PATCH 5/5] wip Signed-off-by: Karl W Schulz --- .github/workflows/mi100.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mi100.yml b/.github/workflows/mi100.yml index 433e40f49..617f75eff 100644 --- a/.github/workflows/mi100.yml +++ b/.github/workflows/mi100.yml @@ -17,7 +17,7 @@ jobs: build: runs-on: [mi100, rhel9] env: - PYTHONPATH: "$GITHUB_WORKSPACE/python-libs" + PYTHONPATH: ${{ github.workspace }}/python-libs steps: - name: Checkout uses: actions/checkout@v3