fix osxarm build

janclemenslab · Nov 5, 2024 · f323d83 · f323d83
1 parent 5d2d951
commit f323d83
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/conda/das-osxarm/build.sh b/conda/das-osxarm/build.sh
@@ -4,10 +4,7 @@ export PIP_NO_INDEX=False
 export PIP_NO_DEPENDENCIES=False
 export PIP_IGNORE_INSTALLED=False
 
-$PYTHON -m pip install keras-tuner==1.1.2 kt-legacy -vv --no-dependencies
-# $PYTHON -m pip install kt-legacy -vv --no-dependencies
-# $PYTHON -m pip install tensorflow-macos==2.9 tensorflow-metal==0.5.0
-# $PYTHON -m pip install tensorflow-macos==2.13 tensorflow-metal==1.0.0
-$PYTHON -m pip install tensorflow-macos==2.14 tensorflow-metal==1.1.0
-$PYTHON -m pip install das -vv --no-dependencies
+# $PYTHON -m pip install tensorflow==2.15.1 tensorflow-metal==1.1.0 numpy==1.23.5
+# $PYTHON -m pip install tensorflow==2.15.1 tensorflow-metal==1.1.0
+$PYTHON -m pip install das --no-dependencies
 
diff --git a/conda/das-osxarm/meta.yaml b/conda/das-osxarm/meta.yaml
@@ -20,21 +20,20 @@ requirements:
     - pip
   run:
     - python {{ python }}
-    - rich
-    - flammkuchen
-    - matplotlib
-    - pandas
-    - numpy
-    - peakutils
-    - pyyaml
-    - defopt=6.3
-    - pyside2
-    - scikit-learn
-    - scikit-image
-    # - tqdm
-    - xarray-behave>=0.34.2
-    - keras
-    - keras-tuner
+    # - rich
+    # - flammkuchen
+    # - matplotlib
+    # - pandas
+    # - numpy=1.23.5  # [py<=311]
+    # - peakutils
+    # - pyyaml
+    # - defopt=6.3
+    # - scikit-learn
+    # - scikit-image
+    - tqdm
+    - xarray-behave=0.35.7
+    - conda-forge::tensorflow=2.15  # [py<=311]
+    # - tensorflow # [py==312]
 
 test:
   imports:

diff --git a/conda/das-osxarm/post-link.sh b/conda/das-osxarm/post-link.sh
@@ -0,0 +1 @@
+pip install "tensorflow==2.15.1" "tensorflow-metal==1.1.0"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		pip install "tensorflow==2.15.1" "tensorflow-metal==1.1.0"