From f409d0c27c246c711d0dc372ffa36ffed2695692 Mon Sep 17 00:00:00 2001 From: Christopher McCarthy Date: Wed, 17 Jul 2024 14:11:48 +0000 Subject: [PATCH 1/4] #2758 - Updated azure-benchmark-pipeline.yaml to use 'Imaginary Yak Pool' --- .azure/azure-benchmark-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/azure-benchmark-pipeline.yaml b/.azure/azure-benchmark-pipeline.yaml index 8bd7d08e..378187e4 100644 --- a/.azure/azure-benchmark-pipeline.yaml +++ b/.azure/azure-benchmark-pipeline.yaml @@ -19,7 +19,7 @@ jobs: - job: PrimAITE_Benchmark timeoutInMinutes: 360 # 6-hour maximum pool: - vmImage: ubuntu-latest + name: 'Imaginary Yak Pool' workspace: clean: all steps: From c7431fa0c81f69e269eae39a0a3519aa7045a45f Mon Sep 17 00:00:00 2001 From: Christopher McCarthy Date: Wed, 17 Jul 2024 14:20:53 +0000 Subject: [PATCH 2/4] #2758 - Updated azure-benchmark-pipeline.yaml to use python3.10 on the yak pool vm --- .azure/azure-benchmark-pipeline.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure/azure-benchmark-pipeline.yaml b/.azure/azure-benchmark-pipeline.yaml index 378187e4..f29a85ef 100644 --- a/.azure/azure-benchmark-pipeline.yaml +++ b/.azure/azure-benchmark-pipeline.yaml @@ -47,15 +47,15 @@ jobs: addToPath: true - script: | - python -m pip install --upgrade pip - pip install -e .[dev,rl] + python3.10 -m pip install --upgrade pip + python3.10 -m pip install -e .[dev,rl] primaite setup displayName: 'Install Dependencies' - script: | set -e cd benchmark - python3 primaite_benchmark.py + python3.10 -m pip primaite_benchmark.py cd .. displayName: 'Run Benchmarking Script' From 2900ca9b2af36cd4ef438ad0f531f5dda009f81c Mon Sep 17 00:00:00 2001 From: Christopher McCarthy Date: Wed, 17 Jul 2024 14:33:44 +0000 Subject: [PATCH 3/4] #2758 - Updated azure-benchmark-pipeline.yaml so that is created a venv on the vm --- .azure/azure-benchmark-pipeline.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.azure/azure-benchmark-pipeline.yaml b/.azure/azure-benchmark-pipeline.yaml index f29a85ef..0d0575b7 100644 --- a/.azure/azure-benchmark-pipeline.yaml +++ b/.azure/azure-benchmark-pipeline.yaml @@ -22,10 +22,15 @@ jobs: name: 'Imaginary Yak Pool' workspace: clean: all + steps: - checkout: self persistCredentials: true + - script: | + $(python.version)-m venv venv + displayName: 'Create venv' + - script: | VERSION=$(cat src/primaite/VERSION | tr -d '\n') if [[ "$(Build.SourceBranch)" == "refs/heads/dev" ]]; then @@ -41,21 +46,18 @@ jobs: echo "##vso[task.setvariable variable=MAJOR_VERSION]$MAJOR_VERSION" displayName: 'Set Version Variables' - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.11' - addToPath: true - - script: | - python3.10 -m pip install --upgrade pip - python3.10 -m pip install -e .[dev,rl] + source venv/bin/activate + pip install --upgrade pip + pip install -e .[dev,rl] primaite setup displayName: 'Install Dependencies' - script: | set -e + source venv/bin/activate cd benchmark - python3.10 -m pip primaite_benchmark.py + python primaite_benchmark.py cd .. displayName: 'Run Benchmarking Script' From b83bab2e2e916b93862d621cecf0c0d43c8e71ba Mon Sep 17 00:00:00 2001 From: Christopher McCarthy Date: Wed, 17 Jul 2024 14:34:51 +0000 Subject: [PATCH 4/4] #2758 - Updated azure-benchmark-pipeline.yaml --- .azure/azure-benchmark-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/azure-benchmark-pipeline.yaml b/.azure/azure-benchmark-pipeline.yaml index 0d0575b7..78c40bfd 100644 --- a/.azure/azure-benchmark-pipeline.yaml +++ b/.azure/azure-benchmark-pipeline.yaml @@ -28,7 +28,7 @@ jobs: persistCredentials: true - script: | - $(python.version)-m venv venv + python3.10 -m venv venv displayName: 'Create venv' - script: |