Skip to content

Commit

Permalink
Merge pull request #93 from albangossard/main
Browse files Browse the repository at this point in the history
Resolve conflicts to add zarr as a dependency
  • Loading branch information
marvande authored Feb 26, 2025
2 parents 8e58c75 + dedb9f2 commit 33962e3
Show file tree
Hide file tree
Showing 4 changed files with 268 additions and 342 deletions.
2 changes: 1 addition & 1 deletion environment_cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ name: MassBalanceMachine
channels:
- conda-forge
dependencies:
- python==3.10
- python==3.11
- poetry
2 changes: 1 addition & 1 deletion environment_gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: MassBalanceMachine
channels:
- conda-forge
dependencies:
- python==3.10
- python==3.11
- poetry
- cudatoolkit
- cupy
Loading

0 comments on commit 33962e3

Please sign in to comment.