Skip to content

fv3net environment on apple chips #2258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
brianhenn wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

fv3net environment on apple chips #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ea73301
add osx-arm64 lock file and installation
brianhenn Jun 28, 2023
39cae0c
maintain current usage of conda-lock
brianhenn Jun 28, 2023
7c7c50d
remove unused lockfile
brianhenn Jun 28, 2023
e30b315
initial attempt to add fv3net env on mac to CI
brianhenn Jun 30, 2023
be401ad
add to workflow
brianhenn Jun 30, 2023
e422162
Updated config.yml
brianhenn Jun 30, 2023
3280756
Updated config.yml
brianhenn Jun 30, 2023
63043b4
add parameter matrix to job call
brianhenn Jun 30, 2023
4dcddaf
Updated config.yml
brianhenn Jun 30, 2023
6897f65
debug config.yaml
brianhenn Jun 30, 2023
889e743
unpin setuptools
brianhenn Jun 30, 2023
8d550a5
debug config.yml
brianhenn Jun 30, 2023
887f87e
unpin pip also
brianhenn Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,49 @@ jobs:
- run: sudo apt-get install make
- run: make test_argo

fv3net_env_macos:
parameters:
resource_class:
default: x86.medium.gen2
type: enum
enum:
- x86.medium.gen2
- m1.medium.gen1
macos:
xcode: 14.0.1
resource_class: macos.<<parameters.resource_class>>
environment:
GOOGLE_PROJECT_ID: vcm-ml
GOOGLE_COMPUTE_ZONE: us-central1
GOOGLE_APPLICATION_CREDENTIALS: /tmp/key.json
steps:
- checkout
- run: brew install wget
- run: mkdir -p miniconda3
- when:
condition:
equal: [x86.medium.gen2, <<parameters.resource_class>>]
steps:
- run: |
wget https://repo.anaconda.com/miniconda/Miniconda3-py38_23.3.1-0-MacOSX-x86_64.sh \
-O miniconda3/miniconda.sh
- when:
condition:
equal: [m1.medium.gen1, <<parameters.resource_class>>]
steps:
- run: |
wget https://repo.anaconda.com/miniconda/Miniconda3-py38_23.3.1-0-MacOSX-arm64.sh \
-O miniconda3/miniconda.sh
- run: |
bash miniconda3/miniconda.sh -b -u -p miniconda3
rm -rf miniconda3/miniconda.sh
miniconda3/bin/conda init bash
- run: |
bash .environment-scripts/build_environment.sh fv3net
bash .environment-scripts/install_local_packages.sh fv3net



build_default:
parameters:
image:
Expand Down Expand Up @@ -285,6 +328,13 @@ workflows:
branches:
ignore:
- master
- fv3net_env_macos:
name: fv3net-env-<<matrix.resource_class>>
matrix:
parameters:
resource_class:
- x86.medium.gen2
- m1.medium.gen1
# manually trigger on PRs
- build_default:
name: "Test Dataflow (held)"
Expand Down
6 changes: 3 additions & 3 deletions .environment-scripts/build_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ CONDA_BASE=$(conda info --base)
case $(uname) in
Darwin)
case $(uname -m) in
# arm64)
# packages=conda-osx-arm64.lock
# ;;
arm64)
packages=conda-osx-arm64.lock
;;
x86_64)
packages=conda-osx-64.lock
;;
Expand Down
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,9 @@ update_submodules:
############################################################

lock_deps: lock_pip
conda-lock -f environment.yml
conda-lock render
Copy link
Contributor Author

@brianhenn brianhenn Jun 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The render command and the output it produced (the multi-platform conda-lock.yml file) was not actually used in making our environments.

# external directories must be explicitly listed to avoid model requirements files which use locked versions
conda-lock -f environment.yml -p osx-64 -p osx-arm64 -p linux-64

# external directories must be explicitly listed to avoid model requirements files which use locked versions
REQUIREMENTS = external/vcm/setup.py \
pip-requirements.txt \
external/fv3kube/setup.py \
Expand Down
206 changes: 113 additions & 93 deletions conda-linux-64.lock
View file
Open in desktop

Large diffs are not rendered by default.

Loading