From 95740a2f06950b70c47e398db5d610ac49ee3c88 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Sun, 20 Nov 2022 07:58:45 +0000 Subject: [PATCH 1/7] no torch --- .github/workflows/code-checks.yml | 2 ++ asv_bench/asv.conf.json | 1 + ci/deps/asv.yaml | 33 +++++++++++++++++++++++++++++++ environment.yml | 1 - requirements-dev.txt | 1 - 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 ci/deps/asv.yaml diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 583619826265c..8e0c031959130 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -116,6 +116,8 @@ jobs: - name: Set up Conda uses: ./.github/actions/setup-conda + with: + environment-file: ci/deps/actions-38-minimum_versions.yaml - name: Build Pandas id: build diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 4a0c882640eb6..74328d706893e 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -50,6 +50,7 @@ "numexpr": [], "pytables": [null, ""], // platform dependent, see excludes below "pyarrow": [], + "pytorch": [], "tables": [null, ""], "openpyxl": [], "xlsxwriter": [], diff --git a/ci/deps/asv.yaml b/ci/deps/asv.yaml new file mode 100644 index 0000000000000..e5da61a305067 --- /dev/null +++ b/ci/deps/asv.yaml @@ -0,0 +1,33 @@ +# Dependencies used in ASV performance benchmarks +name: pandas-dev +channels: + - conda-forge +dependencies: + - python=3.8 + + # test dependencies + - cython>=0.29.32 + + # required dependencies + - python-dateutil + - numpy + - pytz + + # optional dependencies + - jinja2 + - numba + - numexpr + - openpyxl + - odfpy + - pyarrow + - pytables + - scipy + - sqlalchemy + - xlrd + - xlsxwriter + + # downstream packages + - ipython + - pyyaml + - py + - pytorch diff --git a/environment.yml b/environment.yml index 3c1df67782132..4524961a634f6 100644 --- a/environment.yml +++ b/environment.yml @@ -69,7 +69,6 @@ dependencies: - pandas-datareader - pyyaml - py - - pytorch # local testing dependencies - moto diff --git a/requirements-dev.txt b/requirements-dev.txt index 30ee35db05c50..a5d531f616061 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -58,7 +58,6 @@ coverage pandas-datareader pyyaml py -torch moto flask asv From e14c723422064e3a93d08d620b476ff47fe69b24 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Mon, 21 Nov 2022 08:54:48 +0000 Subject: [PATCH 2/7] put correct env file --- .github/workflows/code-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 8e0c031959130..61b25a0fd6243 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -117,7 +117,7 @@ jobs: - name: Set up Conda uses: ./.github/actions/setup-conda with: - environment-file: ci/deps/actions-38-minimum_versions.yaml + environment-file: ci/deps/asv.yaml - name: Build Pandas id: build From 80abb35080d8a517ca21ab13ba310d7dd8a30c4f Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Mon, 21 Nov 2022 09:10:43 +0000 Subject: [PATCH 3/7] add asv to asv.yaml file --- ci/deps/asv.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/deps/asv.yaml b/ci/deps/asv.yaml index e5da61a305067..18f4c589b2ff5 100644 --- a/ci/deps/asv.yaml +++ b/ci/deps/asv.yaml @@ -31,3 +31,6 @@ dependencies: - pyyaml - py - pytorch + + # benchmarks + - asv From db09ccc52f62bbce7eb6d97e06f92c9c35b354f9 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Mon, 21 Nov 2022 09:33:58 +0000 Subject: [PATCH 4/7] fixup dependencies in asv.yaml --- ci/deps/asv.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/deps/asv.yaml b/ci/deps/asv.yaml index 18f4c589b2ff5..59ef551100507 100644 --- a/ci/deps/asv.yaml +++ b/ci/deps/asv.yaml @@ -15,6 +15,7 @@ dependencies: # optional dependencies - jinja2 + - matplotlib - numba - numexpr - openpyxl @@ -27,8 +28,6 @@ dependencies: - xlsxwriter # downstream packages - - ipython - - pyyaml - py - pytorch From eea0ce9d87f293f4b44d926df89422263d754460 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Mon, 21 Nov 2022 12:20:50 +0000 Subject: [PATCH 5/7] wip debug asv gha --- .github/workflows/code-checks.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 61b25a0fd6243..d596bb18d0780 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -127,7 +127,9 @@ jobs: run: | cd asv_bench asv machine --yes - asv run --quick --dry-run --strict --durations=30 --python=same + git branch + git branch --show-current + asv run --quick --dry-run --strict --durations=30 build_docker_dev_environment: name: Build Docker Dev Environment From 13c6888f2b4d2ae0eb880511796d0b350d2862c3 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Mon, 21 Nov 2022 13:15:29 +0000 Subject: [PATCH 6/7] debug --- .github/workflows/code-checks.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index d596bb18d0780..9cac3932755fa 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -125,10 +125,16 @@ jobs: - name: Run ASV benchmarks run: | - cd asv_bench - asv machine --yes git branch + + - name: Run ASV benchmarks + run: | git branch --show-current + + - name: Run ASV benchmarks + run: | + cd asv_bench + asv machine --yes asv run --quick --dry-run --strict --durations=30 build_docker_dev_environment: From 15b0cb4bb010a27ed39d0e6c6c37ff1243767329 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Mon, 21 Nov 2022 13:46:23 +0000 Subject: [PATCH 7/7] fetch origin --- .github/workflows/code-checks.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 9cac3932755fa..925284341a7f4 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -119,13 +119,9 @@ jobs: with: environment-file: ci/deps/asv.yaml - - name: Build Pandas - id: build - uses: ./.github/actions/build_pandas - - name: Run ASV benchmarks run: | - git branch + git remote -v - name: Run ASV benchmarks run: | @@ -134,6 +130,7 @@ jobs: - name: Run ASV benchmarks run: | cd asv_bench + git fetch origin main:main asv machine --yes asv run --quick --dry-run --strict --durations=30