Skip to content

Commit

Permalink
Merge branch 'main' into cudf_issue
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Aug 22, 2024
2 parents 2ef9a7a + 3be13c7 commit beadf54
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/asv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,17 @@ jobs:
with:
fetch-depth: 0

- name: Set up conda python3.9
uses: conda-incubator/setup-miniconda@v2
- name: Set up conda python3.11
uses: conda-incubator/setup-miniconda@v3.0.4
with:
python-version: 3.9
python-version: 3.11

- name: Install dependencies
id: build
shell: bash -el {0}
run: |
pip install numpy scipy cython asv==0.5.1 coverage
conda install anaconda::libmambapy
pip install "numpy<2.0" scipy cython coverage asv
cd python && pip install -e ".[dev,extra]"
- name: Run ASV benchmarks
Expand All @@ -49,7 +50,7 @@ jobs:
git remote add upstream https://github.com/xorbitsai/xorbits.git
git fetch upstream
asv machine --yes
asv continuous -f 1.1 --strict --show-stderr upstream/main HEAD
asv continuous -f 1.1 --show-stderr upstream/main HEAD
if: ${{ steps.build.outcome == 'success' }}

- name: Publish benchmarks artifact
Expand Down
18 changes: 9 additions & 9 deletions asv/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
//
// "install_command": ["in-dir={env_dir} python -mpip install {wheel_file}"],
// "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"],
// "build_command": [
// "python setup.py build",
// "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}"
// ],
"build_command": [
"python -m pip install build",
"python -m build --wheel -o {build_cache_dir} {build_dir}"
],

// List of branches to benchmark. If not provided, defaults to "master"
// (for git) or "default" (for mercurial).
Expand All @@ -44,7 +44,7 @@
// If missing or the empty string, the tool will be automatically
// determined by looking for tools on the PATH environment
// variable.
"environment_type": "conda",
"environment_type": "virtualenv",

// timeout in seconds for installing any dependencies in environment
// defaults to 10 min
Expand All @@ -55,7 +55,7 @@

// The Pythons you'd like to test against. If not provided, defaults
// to the current version of Python used to run `asv`.
"pythons": ["3.9"],
"pythons": ["3.11"],

// The list of conda channel names to be searched for benchmark
// dependency packages in the specified order
Expand Down Expand Up @@ -85,10 +85,10 @@
// will not be set for the current combination.
//
"matrix": {
"numpy": [],
"Cython": ["0.29.24"],
"numpy": ["1.26.4"],
"Cython": [],
"pandas": [],
"scipy": ["1.10.0"],
"scipy": [],
"scikit-learn": [],
"numexpr": [],
"cloudpickle": [],
Expand Down

0 comments on commit beadf54

Please sign in to comment.