Skip to content

Merge main branch to develop#151

Merged
domfournier merged 35 commits intodevelopfrom
merge_main_to_develop
Feb 22, 2025
Merged

Merge main branch to develop#151
domfournier merged 35 commits intodevelopfrom
merge_main_to_develop

Conversation

@sebhmg
Copy link
Contributor

@sebhmg sebhmg commented Feb 20, 2025

No description provided.

sebhmg and others added 29 commits February 11, 2025 07:58
fetching from packages.prefix.dev but that did not change the version resolution
DEVOPS-635: build conda package faster with rattler-build
# Conflicts:
#	recipe.yaml
GEOPY-2009: use newer MKL for compatibility with PyTorch 2.5
# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	environments/py-3.11-linux-64-dev.conda.lock.yml
#	environments/py-3.11-linux-64.conda.lock.yml
#	environments/py-3.11-win-64-dev.conda.lock.yml
#	environments/py-3.11-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	pyproject.toml
#	recipe.yaml
#	simpeg_drivers/__init__.py
#	tests/run_tests/driver_airborne_tem_test.py
#	tests/run_tests/driver_ground_tem_test.py
…velop

# Conflicts:
#	tests/run_tests/driver_airborne_tem_test.py
#	tests/run_tests/driver_ground_tem_test.py
@sebhmg sebhmg requested a review from domfournier February 20, 2025 22:31
# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	environments/py-3.11-linux-64-dev.conda.lock.yml
#	environments/py-3.11-linux-64.conda.lock.yml
#	environments/py-3.11-win-64-dev.conda.lock.yml
#	environments/py-3.11-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	pyproject.toml
@domfournier domfournier merged commit 1c0eebc into develop Feb 22, 2025
5 of 9 checks passed
@domfournier domfournier deleted the merge_main_to_develop branch February 22, 2025 00:06
- metis=5.1.0=hd0bcaf9_1007
- mistune=3.1.2=pyhd8ed1ab_0
- mkl=2024.2.2=ha957f24_16
- mkl=2023.2.0=h84fe81f_50496
Copy link
Contributor Author

@sebhmg sebhmg Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@domfournier, no, it cannot be back to 2023, as it is not compatible with the version of pytorch we use in other packages

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows tests don't pass otherwise

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants