Merge branch 'main' of github.com:dianna-ai/dianna

dianna-ai · Mar 13, 2024 · 452838f · 452838f
2 parents c7a87f7 + c45c5ff
commit 452838f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/dianna/utils/maskers.py b/dianna/utils/maskers.py
@@ -104,7 +104,8 @@ def _determine_number_masked(p_keep: float, series_length: int) -> int:
     ceil = np.ceil(mean)
     if floor != ceil:
         user_requested_steps = int(
-            np.random.choice([floor, ceil], 1, p=[ceil - mean, mean - floor]))
+            np.random.choice([floor, ceil], 1, p=[ceil - mean,
+                                                  mean - floor])[0])
     else:
         user_requested_steps = int(floor)
 

diff --git a/setup.cfg b/setup.cfg
@@ -43,14 +43,14 @@ install_requires =
     onnx==1.14.1
     onnx_tf
     onnxruntime
-    shap
+    shap<0.45
     scikit-image>=0.19.3
     scikit-learn
     tqdm
     xarray
     # tf and tfprob are required but not declared by onnx_tf
-    tensorflow >= 2.12
-    tensorflow_probability
+    tensorflow >= 2.12,<2.16
+    tensorflow_probability <0.24
     # https://setuptools.pypa.io/en/latest/userguide/datafiles.html#accessing-data-files-at-runtime
     importlib_resources;python_version<'3.10'