From 4b2691f68f63de672d3bb12ebf8469e9c4adfb8a Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 00:45:28 -0700 Subject: [PATCH 01/48] adding model benchmarking workflow --- .github/workflows/model_benchmarking.yml | 68 ++++++++++++++++++++ ambient_sound_analysis/model_benchmarking.py | 61 ++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 .github/workflows/model_benchmarking.yml create mode 100644 ambient_sound_analysis/model_benchmarking.py diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml new file mode 100644 index 0000000..a5a66fa --- /dev/null +++ b/.github/workflows/model_benchmarking.yml @@ -0,0 +1,68 @@ +name: Model Benchmarking + +on: + pull request: + types: ['opened'] + +env: + pr_username: github.event.pull_request.user.login + + # schedule: + # - cron: '9 * * * *' + +jobs: + process: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-python@v5 + with: + python-version: '3.9.18' + cache: 'pip' + cache-dependency-path: ambient_sound_analysis/requirements_noise.txt + + - name: Install Python dependencies + run: | + pip install -r ambient_sound_analysis/requirements_noise.txt + + + # - name: Install ffmpeg + # run: | + # sudo apt-get update + # sudo apt-get install ffmpeg + + - uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: ffmpeg + + - name: Create plots + if: steps.cache.outputs.cache-hit != 'true' + run: | + python ambient_sound_analysis/model_benchmarking.py + + + + - name: Append username + run:| + sed 's/$/ $pr_username/' 'csv/2024-06-01 17:00:00.csv' > 'csv/2024-06-01 17:00:00_new.csv' + + - name: Upload to GitHub repo + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: Commit to Github + file_pattern: 'ambient_sound_analysis/csv/*.csv' + + #- name: Upload as artifact + # uses: actions/upload-artifact@v4 + # with: + # name: ambient_sound_plots + # path: ambient_sound_analysis/img/*.png + + #- name: Upload to Google Drive + # uses: AnimMouse/setup-rclone@v1 + # with: + # rclone_config: ${{secrets.RCLONE_CONFIG}} + + # - run: | + # rclone copy ambient_sound_analysis/img/broadband.png mydrive:rclone_uploads/ diff --git a/ambient_sound_analysis/model_benchmarking.py b/ambient_sound_analysis/model_benchmarking.py new file mode 100644 index 0000000..1e84fbc --- /dev/null +++ b/ambient_sound_analysis/model_benchmarking.py @@ -0,0 +1,61 @@ +# importing general Python libraries +import pandas as pd +import datetime as dt +import os +import matplotlib.pyplot as plt +import pytz +import plotly.graph_objects as go +import numpy as np + +# importing orcasound_noise libraries +from orcasound_noise.pipeline.pipeline import NoiseAnalysisPipeline +from orcasound_noise.utils import Hydrophone +from orcasound_noise.pipeline.acoustic_util import plot_spec, plot_bb + + +# Set Location and Resolution +# Port Townsend, 1 Hz Frequency, 60-second samples +if __name__ == '__main__': + pipeline = NoiseAnalysisPipeline(Hydrophone.ORCASOUND_LAB, + delta_f=10, bands=None, + delta_t=60, mode='safe') + + + + +# Generate parquet dataframes with noise levels for a time period + +# now = dt.datetime.now(pytz.timezone('US/Pacific')) +# fix time +now = dt.datetime(2024, 6, 1, 17, 0, 0) +psd_path, broadband_path = pipeline.generate_parquet_file(now - dt.timedelta(hours = 13), + now - dt.timedelta(hours = 8), + upload_to_s3=False) + +# Read the parquet files +# psd_df = pd.read_parquet(psd_path) +bb_df = pd.read_parquet(broadband_path) + +# set threshold +threshold = 5 + +import numpy as np +nof_ships = (np.diff((bb_df['0']>threshold).astype('uint8'))==1).sum() + + +# Create a new directory if it does not exist +if not os.path.exists('ambient_sound_analysis/csv'): + os.makedirs('ambient_sound_analysis/csv') + +pd.DataFrame(nof_ships).to_csv('csv/'+str(now)+'.csv', header=False, index=False) + + + + +# Create and save psd plot +# fig = plot_spec(psd_df) +# fig.write_image('ambient_sound_analysis/img/psd.png') + +# Create and save bb plot +# fig = plot_bb(bb_df) +# fig.savefig('ambient_sound_analysis/img/broadband.png') From f4dabefef67d402fa1dde5be48cf83f6d5d6448f Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 00:50:55 -0700 Subject: [PATCH 02/48] fixing typo --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index a5a66fa..2114066 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -49,7 +49,7 @@ jobs: - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 - with: + with: commit_message: Commit to Github file_pattern: 'ambient_sound_analysis/csv/*.csv' From 0b972653ad51d38a6de04f02b7a50b9ce8a9e3f2 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 00:52:55 -0700 Subject: [PATCH 03/48] adding edited --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 2114066..152cbb4 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -2,7 +2,7 @@ name: Model Benchmarking on: pull request: - types: ['opened'] + types: ['opened','edited'] env: pr_username: github.event.pull_request.user.login From 66d1da729a7ceb2441acdb07b3a0f7768b2eb060 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 00:59:34 -0700 Subject: [PATCH 04/48] fixing formatting --- .github/workflows/model_benchmarking.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 152cbb4..e24db9d 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -44,8 +44,8 @@ jobs: - name: Append username - run:| - sed 's/$/ $pr_username/' 'csv/2024-06-01 17:00:00.csv' > 'csv/2024-06-01 17:00:00_new.csv' + run: | + sed 's/$/ test/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 From 282e2123703ac8c7a9c8d07afbe27b70dbe324f1 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 01:01:21 -0700 Subject: [PATCH 05/48] formatting --- .github/workflows/model_benchmarking.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index e24db9d..626eaa0 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -49,9 +49,9 @@ jobs: - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: Commit to Github - file_pattern: 'ambient_sound_analysis/csv/*.csv' + with: + commit_message: Commit to Github + file_pattern: 'ambient_sound_analysis/csv/*.csv' #- name: Upload as artifact # uses: actions/upload-artifact@v4 From 66830a3ec9e5fe5d5d346691f8db09d98ef73bf6 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 01:02:28 -0700 Subject: [PATCH 06/48] pull_request --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 626eaa0..eddd789 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -1,7 +1,7 @@ name: Model Benchmarking on: - pull request: + pull_request: types: ['opened','edited'] env: From a8cac59874946f338967b0028e22a0cfa2772db0 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 01:10:52 -0700 Subject: [PATCH 07/48] pull_request --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index eddd789..4df2186 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -45,7 +45,7 @@ jobs: - name: Append username run: | - sed 's/$/ test/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' + sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 From 25ea3937a88fd156e4d922bce8e2d3e88601e453 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 01:51:43 -0700 Subject: [PATCH 08/48] trigger --- .github/workflows/model_benchmarking.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 4df2186..b665680 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -1,5 +1,4 @@ name: Model Benchmarking - on: pull_request: types: ['opened','edited'] From dcf515c92d0d637d526afe6e1ef0b6d08c4d6728 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 01:55:10 -0700 Subject: [PATCH 09/48] trigger --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index b665680..c78e157 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -1,7 +1,7 @@ name: Model Benchmarking on: pull_request: - types: ['opened','edited'] + types: [opened, synchronized, edited, reopened] env: pr_username: github.event.pull_request.user.login From c7af0f8115c01ae92b8b2ce491aa1aa3214392c0 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 02:22:12 -0700 Subject: [PATCH 10/48] fix pandas --- ambient_sound_analysis/model_benchmarking.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ambient_sound_analysis/model_benchmarking.py b/ambient_sound_analysis/model_benchmarking.py index 1e84fbc..804cb27 100644 --- a/ambient_sound_analysis/model_benchmarking.py +++ b/ambient_sound_analysis/model_benchmarking.py @@ -47,7 +47,9 @@ if not os.path.exists('ambient_sound_analysis/csv'): os.makedirs('ambient_sound_analysis/csv') -pd.DataFrame(nof_ships).to_csv('csv/'+str(now)+'.csv', header=False, index=False) +pd.DataFrame([nof_ships]).to_csv(str(now)+'.csv', header=False, index=False) + + From 059574457f221e5d11a4e2f8cda996af67024f6a Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 02:53:01 -0700 Subject: [PATCH 11/48] fix path --- ambient_sound_analysis/model_benchmarking.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ambient_sound_analysis/model_benchmarking.py b/ambient_sound_analysis/model_benchmarking.py index 804cb27..e43f6bb 100644 --- a/ambient_sound_analysis/model_benchmarking.py +++ b/ambient_sound_analysis/model_benchmarking.py @@ -28,7 +28,7 @@ # now = dt.datetime.now(pytz.timezone('US/Pacific')) # fix time now = dt.datetime(2024, 6, 1, 17, 0, 0) -psd_path, broadband_path = pipeline.generate_parquet_file(now - dt.timedelta(hours = 13), +psd_path, broadband_path = pipeline.generate_parquet_file(now - dt.timedelta(hours = 9), now - dt.timedelta(hours = 8), upload_to_s3=False) @@ -47,7 +47,7 @@ if not os.path.exists('ambient_sound_analysis/csv'): os.makedirs('ambient_sound_analysis/csv') -pd.DataFrame([nof_ships]).to_csv(str(now)+'.csv', header=False, index=False) +pd.DataFrame([nof_ships]).to_csv('ambient_sound_analysis/csv/'+str(now)+'.csv', header=False, index=False) From 136c14f457a6a7be194b2343a1f2124630806e3d Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 11:28:53 -0700 Subject: [PATCH 12/48] switching to no space name --- .github/workflows/model_benchmarking.yml | 3 ++- ambient_sound_analysis/model_benchmarking.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index c78e157..099fabf 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -44,7 +44,8 @@ jobs: - name: Append username run: | - sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' + # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' + sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/test.csv' > 'ambient_sound_analysis/csv/test.csv' - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 diff --git a/ambient_sound_analysis/model_benchmarking.py b/ambient_sound_analysis/model_benchmarking.py index e43f6bb..6d4ee95 100644 --- a/ambient_sound_analysis/model_benchmarking.py +++ b/ambient_sound_analysis/model_benchmarking.py @@ -47,7 +47,9 @@ if not os.path.exists('ambient_sound_analysis/csv'): os.makedirs('ambient_sound_analysis/csv') -pd.DataFrame([nof_ships]).to_csv('ambient_sound_analysis/csv/'+str(now)+'.csv', header=False, index=False) +# pd.DataFrame([nof_ships]).to_csv('ambient_sound_analysis/csv/'+str(now)+'.csv', header=False, index=False) + +pd.DataFrame([nof_ships]).to_csv('ambient_sound_analysis/csv/test.csv', header=False, index=False) From 04bfd363642c9acfec67c0d987ee15b49d207492 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Tue, 25 Jun 2024 18:38:23 +0000 Subject: [PATCH 13/48] Commit to Github --- ambient_sound_analysis/csv/test.csv | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ambient_sound_analysis/csv/test.csv diff --git a/ambient_sound_analysis/csv/test.csv b/ambient_sound_analysis/csv/test.csv new file mode 100644 index 0000000..e69de29 From ac03bc25e396933c56e9cbd727012173800853f8 Mon Sep 17 00:00:00 2001 From: valentina Date: Tue, 25 Jun 2024 15:29:06 -0700 Subject: [PATCH 14/48] test, test_new --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 099fabf..65d9964 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -45,7 +45,7 @@ jobs: - name: Append username run: | # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/test.csv' > 'ambient_sound_analysis/csv/test.csv' + sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/test.csv' > 'ambient_sound_analysis/csv/test_new.csv' - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 From d7702f4fcd4b7f8d6cf7bb464b05185771b267d3 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Tue, 25 Jun 2024 23:09:57 +0000 Subject: [PATCH 15/48] Commit to Github --- ambient_sound_analysis/csv/test.csv | 1 + ambient_sound_analysis/csv/test_new.csv | 1 + 2 files changed, 2 insertions(+) create mode 100644 ambient_sound_analysis/csv/test_new.csv diff --git a/ambient_sound_analysis/csv/test.csv b/ambient_sound_analysis/csv/test.csv index e69de29..d00491f 100644 --- a/ambient_sound_analysis/csv/test.csv +++ b/ambient_sound_analysis/csv/test.csv @@ -0,0 +1 @@ +1 diff --git a/ambient_sound_analysis/csv/test_new.csv b/ambient_sound_analysis/csv/test_new.csv new file mode 100644 index 0000000..40bd1a1 --- /dev/null +++ b/ambient_sound_analysis/csv/test_new.csv @@ -0,0 +1 @@ +1 test trigger From 97084651045b5daaea15c6ccab820b714dba14ba Mon Sep 17 00:00:00 2001 From: valentina Date: Wed, 26 Jun 2024 01:24:14 -0700 Subject: [PATCH 16/48] username --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 65d9964..88b9bc7 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -45,7 +45,7 @@ jobs: - name: Append username run: | # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/test.csv' > 'ambient_sound_analysis/csv/test_new.csv' + sed 's/$/ ${{ github.event.pull_request.user.login }}/' 'ambient_sound_analysis/csv/test.csv' > 'ambient_sound_analysis/csv/test_new.csv' - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 From 0c224f88f60ad3d2c72ebbdcf8abcde7ec6e7022 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Wed, 26 Jun 2024 08:34:50 +0000 Subject: [PATCH 17/48] Commit to Github --- ambient_sound_analysis/csv/test_new.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambient_sound_analysis/csv/test_new.csv b/ambient_sound_analysis/csv/test_new.csv index 40bd1a1..546d767 100644 --- a/ambient_sound_analysis/csv/test_new.csv +++ b/ambient_sound_analysis/csv/test_new.csv @@ -1 +1 @@ -1 test trigger +1 valentina-s From ad90450f868c6bee98fb19253257eefc8ecb2cec Mon Sep 17 00:00:00 2001 From: valentina Date: Sat, 29 Jun 2024 19:32:21 -0700 Subject: [PATCH 18/48] adding sha name --- .github/workflows/model_benchmarking.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 88b9bc7..3b2a9b9 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -45,7 +45,9 @@ jobs: - name: Append username run: | # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - sed 's/$/ ${{ github.event.pull_request.user.login }}/' 'ambient_sound_analysis/csv/test.csv' > 'ambient_sound_analysis/csv/test_new.csv' + sed 's/$/ ${{ github.event.pull_request.user.login }} ${{github.event.pull_request.head.sha}}/' +'ambient_sound_analysis/csv/test.csv' > +'ambient_sound_analysis/csv/test_new.csv' - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 From aaa011308b2acefade584acb33ea63714798c4fe Mon Sep 17 00:00:00 2001 From: valentina Date: Sat, 29 Jun 2024 19:58:29 -0700 Subject: [PATCH 19/48] fixing formattinhg --- .github/workflows/model_benchmarking.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 3b2a9b9..58e4326 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -45,9 +45,7 @@ jobs: - name: Append username run: | # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - sed 's/$/ ${{ github.event.pull_request.user.login }} ${{github.event.pull_request.head.sha}}/' -'ambient_sound_analysis/csv/test.csv' > -'ambient_sound_analysis/csv/test_new.csv' + sed 's/$/ ${{ github.event.pull_request.user.login }} ${{ github.event.pull_request.head.sha }}/' 'ambient_sound_analysis/csv/test.csv' > 'ambient_sound_analysis/csv/test_new.csv' - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 From ce54517de34330fb1c81cc8089af1658fe011faa Mon Sep 17 00:00:00 2001 From: valentina Date: Sat, 29 Jun 2024 20:01:14 -0700 Subject: [PATCH 20/48] synchronize --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 58e4326..fa610f0 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -1,7 +1,7 @@ name: Model Benchmarking on: pull_request: - types: [opened, synchronized, edited, reopened] + types: [opened, synchronize, edited, reopened] env: pr_username: github.event.pull_request.user.login From b42a04fcfc31be3277a546d4b22de2012de38249 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 03:07:03 +0000 Subject: [PATCH 21/48] Commit to Github --- ambient_sound_analysis/csv/test_new.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambient_sound_analysis/csv/test_new.csv b/ambient_sound_analysis/csv/test_new.csv index 546d767..21db07b 100644 --- a/ambient_sound_analysis/csv/test_new.csv +++ b/ambient_sound_analysis/csv/test_new.csv @@ -1 +1 @@ -1 valentina-s +1 valentina-s ce54517de34330fb1c81cc8089af1658fe011faa From 89d9d21a35ca3a33f9b72452e76f490b34bf80ae Mon Sep 17 00:00:00 2001 From: valentina Date: Sat, 29 Jun 2024 20:28:55 -0700 Subject: [PATCH 22/48] filename with sha --- .github/workflows/model_benchmarking.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index fa610f0..ec2bab6 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -45,7 +45,10 @@ jobs: - name: Append username run: | # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - sed 's/$/ ${{ github.event.pull_request.user.login }} ${{ github.event.pull_request.head.sha }}/' 'ambient_sound_analysis/csv/test.csv' > 'ambient_sound_analysis/csv/test_new.csv' + + output_file = "score_${{ github.event.pull_request.head.sha }}.csv" + sed 's/$/, ${{ github.event.pull_request.user.login }}, ${{ github.event.pull_request.head.sha }}, $ {{github.event.pull_request.title}}/' 'ambient_sound_analysis/csv/test.csv' > +"ambient_sound_analysis/csv/$output_file" - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 From fc6443b0ff87dd970a0c3411bb2acaa6cf4e5ebd Mon Sep 17 00:00:00 2001 From: valentina Date: Sat, 29 Jun 2024 20:41:57 -0700 Subject: [PATCH 23/48] filename with sha --- .github/workflows/model_benchmarking.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index ec2bab6..42d8eab 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -46,9 +46,8 @@ jobs: run: | # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - output_file = "score_${{ github.event.pull_request.head.sha }}.csv" - sed 's/$/, ${{ github.event.pull_request.user.login }}, ${{ github.event.pull_request.head.sha }}, $ {{github.event.pull_request.title}}/' 'ambient_sound_analysis/csv/test.csv' > -"ambient_sound_analysis/csv/$output_file" + export output_file = "score_${{ github.event.pull_request.head.sha }}.csv" + sed 's/$/, ${{ github.event.pull_request.user.login }}, ${{ github.event.pull_request.head.sha }}, $ {{github.event.pull_request.title}}/' 'ambient_sound_analysis/csv/test.csv' > "ambient_sound_analysis/csv/$output_file" - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 From 1dbb9106cd9ff69b73a7171f938285650a97d0bb Mon Sep 17 00:00:00 2001 From: valentina Date: Sat, 29 Jun 2024 22:23:41 -0700 Subject: [PATCH 24/48] fixing export spaces --- .github/workflows/model_benchmarking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 42d8eab..035210c 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -46,7 +46,7 @@ jobs: run: | # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' - export output_file = "score_${{ github.event.pull_request.head.sha }}.csv" + export output_file="score_${{ github.event.pull_request.head.sha }}.csv" sed 's/$/, ${{ github.event.pull_request.user.login }}, ${{ github.event.pull_request.head.sha }}, $ {{github.event.pull_request.title}}/' 'ambient_sound_analysis/csv/test.csv' > "ambient_sound_analysis/csv/$output_file" - name: Upload to GitHub repo From 49cbc6b243ab05a9cb5545cffe9a38d4b7f30472 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 05:27:41 +0000 Subject: [PATCH 25/48] Commit to Github --- .../csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv diff --git a/ambient_sound_analysis/csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv b/ambient_sound_analysis/csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv new file mode 100644 index 0000000..03bd842 --- /dev/null +++ b/ambient_sound_analysis/csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv @@ -0,0 +1 @@ +1, valentina-s, 1dbb9106cd9ff69b73a7171f938285650a97d0bb, $ {{github.event.pull_request.title}} From 5f66104695148ed7ca9e515913bcea3865732618 Mon Sep 17 00:00:00 2001 From: valentina Date: Sat, 29 Jun 2024 23:20:16 -0700 Subject: [PATCH 26/48] fixing title --- .github/workflows/model_benchmarking.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/model_benchmarking.yml b/.github/workflows/model_benchmarking.yml index 035210c..e8c341a 100644 --- a/.github/workflows/model_benchmarking.yml +++ b/.github/workflows/model_benchmarking.yml @@ -47,13 +47,13 @@ jobs: # sed 's/$/ test trigger/' 'ambient_sound_analysis/csv/2024-06-01 17:00:00.csv' > 'ambient_sound_analysis/csv/2024-06-01 17:00:00_new.csv' export output_file="score_${{ github.event.pull_request.head.sha }}.csv" - sed 's/$/, ${{ github.event.pull_request.user.login }}, ${{ github.event.pull_request.head.sha }}, $ {{github.event.pull_request.title}}/' 'ambient_sound_analysis/csv/test.csv' > "ambient_sound_analysis/csv/$output_file" + sed 's/$/, ${{ github.event.pull_request.user.login }}, ${{ github.event.pull_request.head.sha }}, ${{github.event.pull_request.title}}/' 'ambient_sound_analysis/csv/test.csv' > "ambient_sound_analysis/csv/$output_file" - name: Upload to GitHub repo uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Commit to Github - file_pattern: 'ambient_sound_analysis/csv/*.csv' + file_pattern: 'ambient_sound_analysis/csv/score*.csv' #- name: Upload as artifact # uses: actions/upload-artifact@v4 From 74427712c4371f3533e4225001cd15737863b0fb Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 00:14:56 -0700 Subject: [PATCH 27/48] removing old csvs --- ambient_sound_analysis/csv/test.csv | 1 - ambient_sound_analysis/csv/test_new.csv | 1 - 2 files changed, 2 deletions(-) delete mode 100644 ambient_sound_analysis/csv/test.csv delete mode 100644 ambient_sound_analysis/csv/test_new.csv diff --git a/ambient_sound_analysis/csv/test.csv b/ambient_sound_analysis/csv/test.csv deleted file mode 100644 index d00491f..0000000 --- a/ambient_sound_analysis/csv/test.csv +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/ambient_sound_analysis/csv/test_new.csv b/ambient_sound_analysis/csv/test_new.csv deleted file mode 100644 index 21db07b..0000000 --- a/ambient_sound_analysis/csv/test_new.csv +++ /dev/null @@ -1 +0,0 @@ -1 valentina-s ce54517de34330fb1c81cc8089af1658fe011faa From 2ce3c9da8142ec2d3b22da1d0c35375fdd5e1e1a Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 00:15:17 -0700 Subject: [PATCH 28/48] adding print in script --- ambient_sound_analysis/model_benchmarking.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ambient_sound_analysis/model_benchmarking.py b/ambient_sound_analysis/model_benchmarking.py index 6d4ee95..ea37f7f 100644 --- a/ambient_sound_analysis/model_benchmarking.py +++ b/ambient_sound_analysis/model_benchmarking.py @@ -49,6 +49,7 @@ # pd.DataFrame([nof_ships]).to_csv('ambient_sound_analysis/csv/'+str(now)+'.csv', header=False, index=False) +print("Nof Ships: "+str(nof_ships)) pd.DataFrame([nof_ships]).to_csv('ambient_sound_analysis/csv/test.csv', header=False, index=False) From 819b03c719490909bc25e3c747065d30e316df5a Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 07:19:44 +0000 Subject: [PATCH 29/48] Commit to Github --- .../csv/score_72b13caee35f09369b3d3c6b082e71bac68316c0.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_72b13caee35f09369b3d3c6b082e71bac68316c0.csv diff --git a/ambient_sound_analysis/csv/score_72b13caee35f09369b3d3c6b082e71bac68316c0.csv b/ambient_sound_analysis/csv/score_72b13caee35f09369b3d3c6b082e71bac68316c0.csv new file mode 100644 index 0000000..1b2cfad --- /dev/null +++ b/ambient_sound_analysis/csv/score_72b13caee35f09369b3d3c6b082e71bac68316c0.csv @@ -0,0 +1 @@ +1, valentina-s, 72b13caee35f09369b3d3c6b082e71bac68316c0, adding model benchmarking workflow From 0d2667537cfe3b0743e5f8e516d6feca7973d677 Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 00:26:33 -0700 Subject: [PATCH 30/48] longer time --- ambient_sound_analysis/model_benchmarking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambient_sound_analysis/model_benchmarking.py b/ambient_sound_analysis/model_benchmarking.py index ea37f7f..8706da7 100644 --- a/ambient_sound_analysis/model_benchmarking.py +++ b/ambient_sound_analysis/model_benchmarking.py @@ -28,7 +28,7 @@ # now = dt.datetime.now(pytz.timezone('US/Pacific')) # fix time now = dt.datetime(2024, 6, 1, 17, 0, 0) -psd_path, broadband_path = pipeline.generate_parquet_file(now - dt.timedelta(hours = 9), +psd_path, broadband_path = pipeline.generate_parquet_file(now - dt.timedelta(hours = 13), now - dt.timedelta(hours = 8), upload_to_s3=False) From d3c1cc3efb0f4e53c480bcbc43afefd16bb4dbf8 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 07:48:51 +0000 Subject: [PATCH 31/48] Commit to Github --- .../csv/score_1f3ac5bc8b3a4914606ceebcbd910a5aac64e50e.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_1f3ac5bc8b3a4914606ceebcbd910a5aac64e50e.csv diff --git a/ambient_sound_analysis/csv/score_1f3ac5bc8b3a4914606ceebcbd910a5aac64e50e.csv b/ambient_sound_analysis/csv/score_1f3ac5bc8b3a4914606ceebcbd910a5aac64e50e.csv new file mode 100644 index 0000000..bc9f5da --- /dev/null +++ b/ambient_sound_analysis/csv/score_1f3ac5bc8b3a4914606ceebcbd910a5aac64e50e.csv @@ -0,0 +1 @@ +17, valentina-s, 1f3ac5bc8b3a4914606ceebcbd910a5aac64e50e, adding model benchmarking workflow From 3857c9df41c2182c8e9cfe3321cdb22ad489073d Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 02:20:25 -0700 Subject: [PATCH 32/48] add notebook --- .../workflows/create_website_benchmarks.yml | 67 ++++++++ .../display_benchmarks.ipynb | 154 ++++++++++++++++++ 2 files changed, 221 insertions(+) create mode 100644 .github/workflows/create_website_benchmarks.yml create mode 100644 ambient_sound_analysis/display_benchmarks.ipynb diff --git a/.github/workflows/create_website_benchmarks.yml b/.github/workflows/create_website_benchmarks.yml new file mode 100644 index 0000000..6fb6715 --- /dev/null +++ b/.github/workflows/create_website_benchmarks.yml @@ -0,0 +1,67 @@ +name: Deploy Spectrogram Website to GitHub Pages + +on: + # Runs on pushes targeting the default branch + push: + branches: ["main", "model_versioning"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + pages: write + id-token: write + +jobs: + # Build Website + build: + runs-on: ubuntu-latest + defaults: + run: + shell: bash -l {0} + steps: + - name: Checkout + uses: actions/checkout@v4 + + - uses: actions/setup-python@v5 + with: + python-version: '3.11' + + + + - name: Install Python dependencies + run: | + pip install dask + pip install ipykernel + pip install nbconvert + + - name: Build Website + shell: bash -el {0} + run: | + cd ambient_sound_analysis + jupyter nbconvert display_benchmarks.ipynb --execute --to html +--output-dir=_build/html --no-input + + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + path: ambient_sound_analysis/_build/html + + + # Publish Website to GitHub Pages if built successfully + deploy: + needs: build + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-latest + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + + steps: + - name: Setup Pages + uses: actions/configure-pages@v5 + + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/ambient_sound_analysis/display_benchmarks.ipynb b/ambient_sound_analysis/display_benchmarks.ipynb new file mode 100644 index 0000000..c9ba904 --- /dev/null +++ b/ambient_sound_analysis/display_benchmarks.ipynb @@ -0,0 +1,154 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "id": "13bdddf3-f048-4bb2-801d-6a8473fa7d9d", + "metadata": {}, + "source": [ + "# Latest Benchmarks" + ] + }, + { + "cell_type": "code", + "execution_count": 67, + "id": "e3e20636-ae99-4892-abbf-fc2661ec9713", + "metadata": {}, + "outputs": [], + "source": [ + "import matplotlib.pyplot as plt" + ] + }, + { + "cell_type": "code", + "execution_count": 68, + "id": "9b8f9eff-5009-4d4e-9e17-a9f14960c073", + "metadata": {}, + "outputs": [], + "source": [ + "import dask.dataframe as ddf" + ] + }, + { + "cell_type": "code", + "execution_count": 69, + "id": "dad42a94-20aa-4976-8ab3-558dc11c67c7", + "metadata": {}, + "outputs": [], + "source": [ + "df = ddf.read_csv(\"csv/*.csv\", header=None, index_col=False)" + ] + }, + { + "cell_type": "code", + "execution_count": 70, + "id": "ae56d8d7-aea5-4a09-971d-a05afcfad2ac", + "metadata": {}, + "outputs": [], + "source": [ + "df = df.compute().reset_index(drop=True)" + ] + }, + { + "cell_type": "code", + "execution_count": 71, + "id": "f4354a33-83ca-4878-bb15-2ea116f32996", + "metadata": {}, + "outputs": [], + "source": [ + "df.columns = [\"# Ships\", \"username\", \"SHA\", \"title\"]" + ] + }, + { + "cell_type": "code", + "execution_count": 72, + "id": "a22b796f-9a02-4d3c-a3b4-335270e0e347", + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
# ShipsusernameSHAtitle
01valentina-s1dbb9106cd9ff69b73a7171f938285650a97d0bb$ {{github.event.pull_request.title}}
11valentina-s72b13caee35f09369b3d3c6b082e71bac68316c0adding model benchmarking workflow
\n", + "
" + ], + "text/plain": [ + " # Ships username SHA \\\n", + "0 1 valentina-s 1dbb9106cd9ff69b73a7171f938285650a97d0bb \n", + "1 1 valentina-s 72b13caee35f09369b3d3c6b082e71bac68316c0 \n", + "\n", + " title \n", + "0 $ {{github.event.pull_request.title}} \n", + "1 adding model benchmarking workflow " + ] + }, + "execution_count": 72, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "df" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3 (ipykernel)", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.9.18" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} From 70764b3e44ab09abe7395e0d9256cd16ea77f86f Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 09:40:47 +0000 Subject: [PATCH 33/48] Commit to Github --- .../csv/score_71236d3146ee8b3354b3d8fea71d69028b83126b.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_71236d3146ee8b3354b3d8fea71d69028b83126b.csv diff --git a/ambient_sound_analysis/csv/score_71236d3146ee8b3354b3d8fea71d69028b83126b.csv b/ambient_sound_analysis/csv/score_71236d3146ee8b3354b3d8fea71d69028b83126b.csv new file mode 100644 index 0000000..988df42 --- /dev/null +++ b/ambient_sound_analysis/csv/score_71236d3146ee8b3354b3d8fea71d69028b83126b.csv @@ -0,0 +1 @@ +17, valentina-s, 71236d3146ee8b3354b3d8fea71d69028b83126b, adding model benchmarking workflow From dea4f044a007a0ad19b0f69fa83f95424c930b49 Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 14:42:09 -0700 Subject: [PATCH 34/48] fix syntax --- .github/workflows/create_website_benchmarks.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/create_website_benchmarks.yml b/.github/workflows/create_website_benchmarks.yml index 6fb6715..f22c2c2 100644 --- a/.github/workflows/create_website_benchmarks.yml +++ b/.github/workflows/create_website_benchmarks.yml @@ -40,8 +40,7 @@ jobs: shell: bash -el {0} run: | cd ambient_sound_analysis - jupyter nbconvert display_benchmarks.ipynb --execute --to html ---output-dir=_build/html --no-input + jupyter nbconvert display_benchmarks.ipynb --execute --to html --output-dir=_build/html --no-input - name: Upload artifact uses: actions/upload-pages-artifact@v3 From ec1b6c72e0fc83d33e9f5ea2a4430708aa97ed1a Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 21:54:25 +0000 Subject: [PATCH 35/48] Commit to Github --- .../csv/score_28401087ddea6a1ac2829d708423b362b8d3840f.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_28401087ddea6a1ac2829d708423b362b8d3840f.csv diff --git a/ambient_sound_analysis/csv/score_28401087ddea6a1ac2829d708423b362b8d3840f.csv b/ambient_sound_analysis/csv/score_28401087ddea6a1ac2829d708423b362b8d3840f.csv new file mode 100644 index 0000000..b900c5f --- /dev/null +++ b/ambient_sound_analysis/csv/score_28401087ddea6a1ac2829d708423b362b8d3840f.csv @@ -0,0 +1 @@ +17, valentina-s, 28401087ddea6a1ac2829d708423b362b8d3840f, adding model benchmarking workflow From e112b9c3af88e357bebc5ce37933a6f488ef9008 Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 15:35:35 -0700 Subject: [PATCH 36/48] removing matplotlib --- ambient_sound_analysis/display_benchmarks.ipynb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ambient_sound_analysis/display_benchmarks.ipynb b/ambient_sound_analysis/display_benchmarks.ipynb index c9ba904..76d5a2d 100644 --- a/ambient_sound_analysis/display_benchmarks.ipynb +++ b/ambient_sound_analysis/display_benchmarks.ipynb @@ -8,16 +8,6 @@ "# Latest Benchmarks" ] }, - { - "cell_type": "code", - "execution_count": 67, - "id": "e3e20636-ae99-4892-abbf-fc2661ec9713", - "metadata": {}, - "outputs": [], - "source": [ - "import matplotlib.pyplot as plt" - ] - }, { "cell_type": "code", "execution_count": 68, From 7ce8e2415d4cb2dfed8dfebcdf7df57ba765779d Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 22:48:16 +0000 Subject: [PATCH 37/48] Commit to Github --- .../csv/score_66b46ac47aa1c2bcbda573e147f3a16eeed61dcd.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_66b46ac47aa1c2bcbda573e147f3a16eeed61dcd.csv diff --git a/ambient_sound_analysis/csv/score_66b46ac47aa1c2bcbda573e147f3a16eeed61dcd.csv b/ambient_sound_analysis/csv/score_66b46ac47aa1c2bcbda573e147f3a16eeed61dcd.csv new file mode 100644 index 0000000..8cd4f15 --- /dev/null +++ b/ambient_sound_analysis/csv/score_66b46ac47aa1c2bcbda573e147f3a16eeed61dcd.csv @@ -0,0 +1 @@ +17, valentina-s, 66b46ac47aa1c2bcbda573e147f3a16eeed61dcd, adding model benchmarking workflow From da098ec835f3d63df4e2cda166253e5a34511453 Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 16:04:29 -0700 Subject: [PATCH 38/48] dask dataframe --- .github/workflows/create_website_benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_website_benchmarks.yml b/.github/workflows/create_website_benchmarks.yml index f22c2c2..3e6bc8e 100644 --- a/.github/workflows/create_website_benchmarks.yml +++ b/.github/workflows/create_website_benchmarks.yml @@ -32,7 +32,7 @@ jobs: - name: Install Python dependencies run: | - pip install dask + pip install "dask[dataframe]" pip install ipykernel pip install nbconvert From ae1cdd3a70dccd063087a57b9ac30c4d34f61ffa Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 16:09:04 -0700 Subject: [PATCH 39/48] removing wrong file --- .../csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ambient_sound_analysis/csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv diff --git a/ambient_sound_analysis/csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv b/ambient_sound_analysis/csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv deleted file mode 100644 index 03bd842..0000000 --- a/ambient_sound_analysis/csv/score_1dbb9106cd9ff69b73a7171f938285650a97d0bb.csv +++ /dev/null @@ -1 +0,0 @@ -1, valentina-s, 1dbb9106cd9ff69b73a7171f938285650a97d0bb, $ {{github.event.pull_request.title}} From cd12ce8cad03004c315e2c175fd61b3ebecdc3be Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 16:13:44 -0700 Subject: [PATCH 40/48] removing main check --- .github/workflows/create_website_benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_website_benchmarks.yml b/.github/workflows/create_website_benchmarks.yml index 3e6bc8e..91c1222 100644 --- a/.github/workflows/create_website_benchmarks.yml +++ b/.github/workflows/create_website_benchmarks.yml @@ -51,7 +51,7 @@ jobs: # Publish Website to GitHub Pages if built successfully deploy: needs: build - if: github.ref == 'refs/heads/main' + # if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest environment: name: github-pages From 6441b4e03ba1585e6d00c9196b2bf99d92f21b20 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 23:15:13 +0000 Subject: [PATCH 41/48] Commit to Github --- .../csv/score_f38875f0d0e246c9035abb2f76602e1a89479171.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_f38875f0d0e246c9035abb2f76602e1a89479171.csv diff --git a/ambient_sound_analysis/csv/score_f38875f0d0e246c9035abb2f76602e1a89479171.csv b/ambient_sound_analysis/csv/score_f38875f0d0e246c9035abb2f76602e1a89479171.csv new file mode 100644 index 0000000..ba3a7b0 --- /dev/null +++ b/ambient_sound_analysis/csv/score_f38875f0d0e246c9035abb2f76602e1a89479171.csv @@ -0,0 +1 @@ +17, valentina-s, f38875f0d0e246c9035abb2f76602e1a89479171, adding model benchmarking workflow From 261b3d3995223783dff16f84ddee14c234116d28 Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 16:24:48 -0700 Subject: [PATCH 42/48] chanching title --- .github/workflows/create_website_benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_website_benchmarks.yml b/.github/workflows/create_website_benchmarks.yml index 91c1222..2d87b67 100644 --- a/.github/workflows/create_website_benchmarks.yml +++ b/.github/workflows/create_website_benchmarks.yml @@ -1,4 +1,4 @@ -name: Deploy Spectrogram Website to GitHub Pages +name: Create Benchmark Website on: # Runs on pushes targeting the default branch From 83726376a2d925b42b5564f8856800f16c3b098e Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 23:32:44 +0000 Subject: [PATCH 43/48] Commit to Github --- .../csv/score_cd12ce8cad03004c315e2c175fd61b3ebecdc3be.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_cd12ce8cad03004c315e2c175fd61b3ebecdc3be.csv diff --git a/ambient_sound_analysis/csv/score_cd12ce8cad03004c315e2c175fd61b3ebecdc3be.csv b/ambient_sound_analysis/csv/score_cd12ce8cad03004c315e2c175fd61b3ebecdc3be.csv new file mode 100644 index 0000000..97653d5 --- /dev/null +++ b/ambient_sound_analysis/csv/score_cd12ce8cad03004c315e2c175fd61b3ebecdc3be.csv @@ -0,0 +1 @@ +17, valentina-s, cd12ce8cad03004c315e2c175fd61b3ebecdc3be, adding model benchmarking workflow From e73560517cfef19b8225f2f77da3de43163b1140 Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 16:34:54 -0700 Subject: [PATCH 44/48] set ref to model versioning --- .github/workflows/create_website_benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_website_benchmarks.yml b/.github/workflows/create_website_benchmarks.yml index 2d87b67..ba2c5b8 100644 --- a/.github/workflows/create_website_benchmarks.yml +++ b/.github/workflows/create_website_benchmarks.yml @@ -51,7 +51,7 @@ jobs: # Publish Website to GitHub Pages if built successfully deploy: needs: build - # if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/model_versioning' runs-on: ubuntu-latest environment: name: github-pages From 566f2392cbe87cbf50f05ffdbdd11ba5431c5b65 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 23:40:49 +0000 Subject: [PATCH 45/48] Commit to Github --- .../csv/score_42aa52eddaf7494cf272de17396907146982e1fd.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_42aa52eddaf7494cf272de17396907146982e1fd.csv diff --git a/ambient_sound_analysis/csv/score_42aa52eddaf7494cf272de17396907146982e1fd.csv b/ambient_sound_analysis/csv/score_42aa52eddaf7494cf272de17396907146982e1fd.csv new file mode 100644 index 0000000..9aa6f36 --- /dev/null +++ b/ambient_sound_analysis/csv/score_42aa52eddaf7494cf272de17396907146982e1fd.csv @@ -0,0 +1 @@ +17, valentina-s, 42aa52eddaf7494cf272de17396907146982e1fd, adding model benchmarking workflow From c742865e41b451d5d3783ec96578dacaa31d5c9a Mon Sep 17 00:00:00 2001 From: valentina-s Date: Sun, 30 Jun 2024 23:51:49 +0000 Subject: [PATCH 46/48] Commit to Github --- .../csv/score_a3d0ab1feae8b9b91c923229c4cf3d5b06e05f98.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_a3d0ab1feae8b9b91c923229c4cf3d5b06e05f98.csv diff --git a/ambient_sound_analysis/csv/score_a3d0ab1feae8b9b91c923229c4cf3d5b06e05f98.csv b/ambient_sound_analysis/csv/score_a3d0ab1feae8b9b91c923229c4cf3d5b06e05f98.csv new file mode 100644 index 0000000..dea0e0a --- /dev/null +++ b/ambient_sound_analysis/csv/score_a3d0ab1feae8b9b91c923229c4cf3d5b06e05f98.csv @@ -0,0 +1 @@ +17, valentina-s, a3d0ab1feae8b9b91c923229c4cf3d5b06e05f98, adding model benchmarking workflow From 6ed1ae6451800b30982b28bf8e79baaf0176c5fe Mon Sep 17 00:00:00 2001 From: valentina Date: Sun, 30 Jun 2024 19:37:46 -0700 Subject: [PATCH 47/48] adding pull request --- .github/workflows/create_website_benchmarks.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_website_benchmarks.yml b/.github/workflows/create_website_benchmarks.yml index ba2c5b8..3bae11e 100644 --- a/.github/workflows/create_website_benchmarks.yml +++ b/.github/workflows/create_website_benchmarks.yml @@ -4,6 +4,8 @@ on: # Runs on pushes targeting the default branch push: branches: ["main", "model_versioning"] + pull_request: + types: ["opened", "reopened", "synchronize", "edited"] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -51,7 +53,7 @@ jobs: # Publish Website to GitHub Pages if built successfully deploy: needs: build - if: github.ref == 'refs/heads/model_versioning' + # if: github.ref == 'refs/heads/model_versioning' runs-on: ubuntu-latest environment: name: github-pages From 5ad32ec5e1c32d139cb3cbc16d347b14ca6385d3 Mon Sep 17 00:00:00 2001 From: valentina-s Date: Mon, 1 Jul 2024 02:50:01 +0000 Subject: [PATCH 48/48] Commit to Github --- .../csv/score_fc9e91bb543073453639b8989614702fdeaaa1e4.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 ambient_sound_analysis/csv/score_fc9e91bb543073453639b8989614702fdeaaa1e4.csv diff --git a/ambient_sound_analysis/csv/score_fc9e91bb543073453639b8989614702fdeaaa1e4.csv b/ambient_sound_analysis/csv/score_fc9e91bb543073453639b8989614702fdeaaa1e4.csv new file mode 100644 index 0000000..001f89c --- /dev/null +++ b/ambient_sound_analysis/csv/score_fc9e91bb543073453639b8989614702fdeaaa1e4.csv @@ -0,0 +1 @@ +17, valentina-s, fc9e91bb543073453639b8989614702fdeaaa1e4, adding model benchmarking workflow