diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md index 529de4e..45bdc19 100644 --- a/.metwork-framework/components.md +++ b/.metwork-framework/components.md @@ -88,8 +88,6 @@ | [tensorboard-data-server](https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server) | 0.7.2 | python3_ia | | [tensorboard](https://github.com/tensorflow/tensorboard) | 2.20.0 | python3_ia | | [tensorboardX](https://github.com/lanpa/tensorboardX) | 2.6.5 | python3_ia | -| [tensorflow](https://www.tensorflow.org/) | 2.21.0 | python3_ia | -| [tf_keras](https://keras.io/) | 2.21.0 | python3_ia | | [tiktoken](https://github.com/openai/tiktoken) | 0.12.0 | python3_ia | | [timm](https://github.com/huggingface/pytorch-image-models) | 1.0.22 | python3_ia | | [tokenizers](https://github.com/huggingface/tokenizers) | 0.22.2 | python3_ia | @@ -102,4 +100,4 @@ | [typeshed_client](https://github.com/JelleZijlstra/typeshed_client) | 2.8.2 | python3_ia | | [uvicorn](https://www.uvicorn.org/) | 0.34.2 | python3_ia | -*(101 components)* +*(99 components)* diff --git a/bootstrap.sh b/bootstrap.sh index 8c83c92..6b52044 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -83,7 +83,7 @@ fi # FIXME: do not hardcode this # FIXME: move to layer root extra_env ? -echo "export PYTHON3_SHORT_VERSION := 3.13" >>adm/root.mk +echo "export PYTHON3_SHORT_VERSION := 3.14" >>adm/root.mk echo "BOOTSTRAP DONE !" echo "MFEXT_HOME=${MFEXT_HOME}" diff --git a/integration_tests/0003_test_import_python3_ia/import_python3_ia.py b/integration_tests/0003_test_import_python3_ia/import_python3_ia.py index 9a65804..f3b12e3 100644 --- a/integration_tests/0003_test_import_python3_ia/import_python3_ia.py +++ b/integration_tests/0003_test_import_python3_ia/import_python3_ia.py @@ -33,6 +33,7 @@ import clang #libclang import lightning_fabric import lightning_utilities +import lightning_fabric import lightning import marshmallow #import mfai @@ -70,8 +71,6 @@ import tensorboard_data_server import tensorboard import tensorboardX -import tensorflow -import tf_keras import tiktoken import timm import tokenizers diff --git a/integration_tests/0096_system_extra_dependencies/test.sh b/integration_tests/0096_system_extra_dependencies/test.sh index 00f2fd2..c9519a2 100755 --- a/integration_tests/0096_system_extra_dependencies/test.sh +++ b/integration_tests/0096_system_extra_dependencies/test.sh @@ -12,6 +12,7 @@ OK_NOT_FOUND=$(cat list_ok_not_found.txt|grep -v "#"|xargs) export PATH=${PATH}:${PWD}/.. RET=0 +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/openmpi/lib diff --git a/layers/layer5_python3_ia/.layerapi2_extra_env b/layers/layer5_python3_ia/.layerapi2_extra_env new file mode 100644 index 0000000..9e628bd --- /dev/null +++ b/layers/layer5_python3_ia/.layerapi2_extra_env @@ -0,0 +1 @@ +KERAS_BACKEND=torch diff --git a/layers/layer5_python3_ia/0500_extra_packages/requirements3.txt b/layers/layer5_python3_ia/0500_extra_packages/requirements3.txt index 65f65e0..b108760 100644 --- a/layers/layer5_python3_ia/0500_extra_packages/requirements3.txt +++ b/layers/layer5_python3_ia/0500_extra_packages/requirements3.txt @@ -86,8 +86,6 @@ tabulate==0.9.0 tensorboard==2.20.0 tensorboard-data-server==0.7.2 tensorboardx==2.6.5 -tensorflow==2.21.0 -tf-keras==2.21.0 tiktoken==0.12.0 timm==1.0.22 tokenizers==0.22.2