From c4b0ea0387585be1943ae4b735f25ad164bde602 Mon Sep 17 00:00:00 2001 From: KasukabeDefenceForce Date: Mon, 29 Jul 2024 19:52:02 +0530 Subject: [PATCH 1/6] Add ready to review to run tests --- .github/workflows/benchmarks.yml | 1 + .github/workflows/build-docs.yml | 1 + .github/workflows/stardis-tests.yml | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 9ed9b5581e4..a36f75bad59 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -14,6 +14,7 @@ on: - reopened - synchronize - labeled # benchmarks label required + - ready_for_review workflow_dispatch: env: diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index bb17c9581f0..a683df87a51 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -18,6 +18,7 @@ on: - reopened - synchronize - labeled # requires the `build-docs` label + - ready_for_review workflow_dispatch: # manual trigger diff --git a/.github/workflows/stardis-tests.yml b/.github/workflows/stardis-tests.yml index fad5fbaa7d9..9196220525f 100644 --- a/.github/workflows/stardis-tests.yml +++ b/.github/workflows/stardis-tests.yml @@ -9,6 +9,11 @@ on: branches: - '*' + types: + - opened + - reopened + - synchronize + - ready_for_review workflow_dispatch: defaults: From b110f0e4d5662c5f8a7b34cfc3c047dc6ea7a8bd Mon Sep 17 00:00:00 2001 From: KasukabeDefenceForce Date: Mon, 29 Jul 2024 20:04:49 +0530 Subject: [PATCH 2/6] Add if condition to check PR status --- .github/workflows/benchmarks.yml | 1 + .github/workflows/build-docs.yml | 1 + .github/workflows/stardis-tests.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index a36f75bad59..2ed44515e7b 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -32,6 +32,7 @@ jobs: build: if: github.repository_owner == 'tardis-sn' && (github.event_name == 'push' || + (!github.event.pull_request.draft) || github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'benchmarks'))) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index a683df87a51..254c19ffbdd 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -38,6 +38,7 @@ defaults: jobs: check-for-changes: runs-on: ubuntu-latest + if: ${{ !github.event.pull_request.draft }} outputs: trigger-check-outcome: ${{ steps.trigger_check.outcome }} docs-check-outcome: ${{ steps.docs_check.outcome }} diff --git a/.github/workflows/stardis-tests.yml b/.github/workflows/stardis-tests.yml index 9196220525f..22c32946222 100644 --- a/.github/workflows/stardis-tests.yml +++ b/.github/workflows/stardis-tests.yml @@ -39,6 +39,7 @@ jobs: name: ${{ matrix.label }} runs-on: ${{ matrix.os }} + if: ${{ !github.event.pull_request.draft }} steps: - uses: actions/checkout@v4 with: From b5565cdbb65bdd96d6135be9e81cf89fca22f60c Mon Sep 17 00:00:00 2001 From: KasukabeDefenceForce Date: Tue, 30 Jul 2024 10:21:03 +0530 Subject: [PATCH 3/6] Running stardis tests only on push to master --- .github/workflows/stardis-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stardis-tests.yml b/.github/workflows/stardis-tests.yml index 22c32946222..88db83defdd 100644 --- a/.github/workflows/stardis-tests.yml +++ b/.github/workflows/stardis-tests.yml @@ -3,7 +3,7 @@ name: stardis-tests on: push: branches: - - '*' + - 'master' pull_request: branches: From 4b63c66757bf87dc7c79c09f64724ad55c5a73b9 Mon Sep 17 00:00:00 2001 From: KasukabeDefenceForce Date: Tue, 30 Jul 2024 14:37:04 +0530 Subject: [PATCH 4/6] Removing osx-64 from workflows --- .github/workflows/stardis-tests.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/stardis-tests.yml b/.github/workflows/stardis-tests.yml index 88db83defdd..a8e09d8a1db 100644 --- a/.github/workflows/stardis-tests.yml +++ b/.github/workflows/stardis-tests.yml @@ -3,7 +3,7 @@ name: stardis-tests on: push: branches: - - 'master' + - master pull_request: branches: @@ -27,16 +27,12 @@ jobs: build: strategy: matrix: - label: [osx-64, linux-64] + label: [linux-64] include: - os: ubuntu-latest label: linux-64 prefix: /usr/share/miniconda3/envs/stardis - - os: macos-latest - label: osx-64 - prefix: /Users/runner/miniconda3/envs/stardis - name: ${{ matrix.label }} runs-on: ${{ matrix.os }} if: ${{ !github.event.pull_request.draft }} From 2cc0e18697c0f8523c932204d649b10ee1939416 Mon Sep 17 00:00:00 2001 From: KasukabeDefenceForce Date: Tue, 30 Jul 2024 18:52:18 +0530 Subject: [PATCH 5/6] Removing owner --- .github/workflows/benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 2ed44515e7b..ead69538f81 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -30,7 +30,7 @@ defaults: jobs: build: - if: github.repository_owner == 'tardis-sn' && + if: (github.event_name == 'push' || (!github.event.pull_request.draft) || github.event_name == 'workflow_dispatch' || From b8b9456193b2fed8826731fd0b80e8f7c642ff55 Mon Sep 17 00:00:00 2001 From: KasukabeDefenceForce Date: Tue, 30 Jul 2024 18:49:29 +0530 Subject: [PATCH 6/6] Testing draft_rtr PR --- benchmarks/spectrum_formal_integral.py | 1 - docs/faq.rst | 6 ------ 2 files changed, 7 deletions(-) diff --git a/benchmarks/spectrum_formal_integral.py b/benchmarks/spectrum_formal_integral.py index c7eb25e6f5a..38057930eaf 100644 --- a/benchmarks/spectrum_formal_integral.py +++ b/benchmarks/spectrum_formal_integral.py @@ -36,7 +36,6 @@ def time_FormalIntegrator_functions(self): self.simulation_verysimple.simulation_state, self.simulation_verysimple.plasma, self.simulation_verysimple.transport ) FormalIntegrator.calculate_spectrum(self.simulation_verysimple.spectrum_solver.spectrum_real_packets.frequency) - FormalIntegrator.make_source_function() FormalIntegrator.generate_numba_objects() FormalIntegrator.formal_integral( self.simulation_verysimple.spectrum_solver.spectrum_real_packets.frequency, diff --git a/docs/faq.rst b/docs/faq.rst index de5f9e737cc..db996b4c9c0 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -23,12 +23,6 @@ Usage My simulation seems to consume excessive amounts of memory ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - -High memory usage can have many reasons. Both your model -and certain simulation settings can increase the memory -usage significantly - 1. Enabling ``track_rpacket: true`` will take up substantial amounts of memory, in particular for higher packet counts. Consider turning this feature off or only use it with a