From e7f979b78e566139be8ccd50f89b8f27be0f9c04 Mon Sep 17 00:00:00 2001 From: Chris McCarthy Date: Wed, 26 Jun 2024 12:52:29 +0100 Subject: [PATCH] #2648 - reverted temp changes to benchmark durations and branch names for testing purposes --- .azure/azure-benchmark-pipeline.yaml | 13 ++++++------- benchmark/primaite_benchmark.py | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.azure/azure-benchmark-pipeline.yaml b/.azure/azure-benchmark-pipeline.yaml index cd8703ec..1f7b8ebe 100644 --- a/.azure/azure-benchmark-pipeline.yaml +++ b/.azure/azure-benchmark-pipeline.yaml @@ -3,14 +3,14 @@ trigger: exclude: - '*' include: - - 'refs/heads/feature/2648_Automate-the-benchmarking-process' + - 'refs/heads/release/*' schedules: - cron: "0 2 * * 1-5" # Run at 2 AM every weekday displayName: "Weekday Schedule" branches: include: - - feature/2648_Automate-the-benchmarking-process + - 'refs/heads/dev' pool: vmImage: ubuntu-latest @@ -25,8 +25,8 @@ steps: - script: | VERSION=$(cat src/primaite/VERSION | tr -d '\n') - if [[ "$(Build.SourceBranch)" == "refs/heads/feature/2648_Automate-the-benchmarking-process" ]]; then - DATE=$(date +%Y%m%d%H%M) + if [[ "$(Build.SourceBranch)" == "refs/heads/dev" ]]; then + DATE=$(date +%Y%m%d) echo "${VERSION}+dev.${DATE}" > src/primaite/VERSION fi displayName: 'Update VERSION file for Dev Benchmark' @@ -60,7 +60,7 @@ steps: git config --global user.name "Defence Science and Technology Laboratory UK" workingDirectory: $(System.DefaultWorkingDirectory) displayName: 'Configure Git' - condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/2648_Automate-the-benchmarking-process')) + condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release')) - script: | git add benchmark/results/v$(MAJOR_VERSION)/v$(VERSION)/* @@ -70,10 +70,9 @@ steps: workingDirectory: $(System.DefaultWorkingDirectory) env: GIT_CREDENTIALS: $(System.AccessToken) - condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/2648_Automate-the-benchmarking-process')) + condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/release')) - script: | - ls benchmark/results/v$(MAJOR_VERSION)/v$(VERSION) tar czf primaite_v$(VERSION)_benchmark.tar.gz benchmark/results/v$(MAJOR_VERSION)/v$(VERSION) displayName: 'Prepare Artifacts for Publishing' diff --git a/benchmark/primaite_benchmark.py b/benchmark/primaite_benchmark.py index 92c9bf0a..f3d0a10c 100644 --- a/benchmark/primaite_benchmark.py +++ b/benchmark/primaite_benchmark.py @@ -151,8 +151,8 @@ def _prepare_session_directory(): def run( - number_of_sessions: int = 1, - num_episodes: int = 25, + number_of_sessions: int = 5, + num_episodes: int = 1000, episode_len: int = 128, n_steps: int = 1280, batch_size: int = 32,