Skip to content

Commit

Permalink
Try to benchmark with conda
Browse files Browse the repository at this point in the history
  • Loading branch information
G-D-Petrov committed Feb 12, 2024
1 parent afa3eba commit de3f896
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
17 changes: 4 additions & 13 deletions .github/workflows/analysis_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
matrix:
commits: ${{ fromJson(needs.get_tag_commits.outputs.matrix) }}
runs-on: ubuntu-latest
container:
image: ${{needs.cibw_docker_image.outputs.tag}}
volumes:
- /:/mnt
# container:
# image: ${{needs.cibw_docker_image.outputs.tag}}
# volumes:
# - /:/mnt
permissions:
contents: write # Technically not necessary since the ARCTICDB_TEST_PAT token override exists
env:
Expand All @@ -64,7 +64,6 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.ARCTICDB_TEST_PAT }}
submodules: recursive # Just in case a dep has its own third-party deps

- name: Set persistent storage variables
uses: ./.github/actions/set_persistent_storage_env_vars
Expand All @@ -76,14 +75,6 @@ jobs:
uses: mozilla-actions/[email protected]
with:
version: "v0.4.0"

- name: Extra envs
# This has to come after msvc-dev-cmd to overwrite the bad VCPKG_ROOT it sets
run: |
./build_tooling/vcpkg_caching.sh # Linux build-python-wheels needs another call in CIBW
echo -e "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES
VCPKG_ROOT=$PLATFORM_VCPKG_ROOT
cmake -P cpp/CMake/CpuCount.cmake | sed 's/^-- //' | tee -a $GITHUB_ENV

- name: Remove GitHub default packages # To save space
run: |
Expand Down
7 changes: 3 additions & 4 deletions asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
// Customizable commands for installing and uninstalling the project.
// See asv.conf.json documentation.
"install_command": [
"python -m pip install {wheel_file}",
"python -m pip install arcticdb[Testing]" // Note: change this if the "matrix" feature below is used
"ARCTICDB_USING_CONDA=1 ARCTIC_CMAKE_PRESET=linux-conda-release python -m pip install --no-build-isolation --no-deps --verbose --editable ." // Note: change this if the "matrix" feature below is used
],
// "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"],

Expand All @@ -57,7 +56,7 @@
// If missing or the empty string, the tool will be automatically
// determined by looking for tools on the PATH environment
// variable.
"environment_type": "virtualenv",
"environment_type": "conda",

// timeout in seconds for installing any dependencies in environment
// defaults to 10 min
Expand All @@ -75,7 +74,7 @@
// "conda_channels": ["conda-forge", "defaults"],

// A conda environment file that is used for environment creation.
// "conda_environment_file": "environment_unix.yml",
"conda_environment_file": "environment_unix.yml",

// The matrix of dependencies to test. Each key of the "req"
// requirements dictionary is the name of a package (in PyPI) and
Expand Down

0 comments on commit de3f896

Please sign in to comment.