diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6d58076..639c7fec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: echo "Version numbers of TensorFlow and Keras:" python3 -c "import tensorflow as tf; import tensorflow.keras; print(tf.__version__)" # FunctionalPlus - git clone -b 'v0.2.20-p0' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus + git clone -b 'v0.2.22' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus cd FunctionalPlus mkdir -p build && cd build cmake .. diff --git a/INSTALL.md b/INSTALL.md index 5e569099..a09091b9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -7,7 +7,7 @@ Installation You can install frugally-deep using cmake as shown below, or (if you prefer) download the [code](https://github.com/Dobiasd/frugally-deep/archive/master.zip) (and the [code](https://github.com/Dobiasd/FunctionalPlus/archive/master.zip) of [FunctionalPlus](https://github.com/Dobiasd/FunctionalPlus)), extract it and tell your compiler to use the `include` directories. ``` -git clone -b 'v0.2.20-p0' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus +git clone -b 'v0.2.22' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus cd FunctionalPlus mkdir -p build && cd build cmake .. diff --git a/conanfile.txt b/conanfile.txt index 5f48f1cc..03514378 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,6 +1,6 @@ [requires] eigen/3.4.0 -functionalplus/v0.2.20-p0 +functionalplus/v0.2.22 nlohmann_json/3.10.5 [generators] diff --git a/test/Dockerfile b/test/Dockerfile index df01514b..0707e738 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -29,7 +29,7 @@ RUN ./bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_p RUN pip install /tmp/tensorflow_pkg/tensorflow-2.13.0-cp310-cp310-linux_x86_64.whl WORKDIR / -RUN git clone -b 'v0.2.20-p0' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus && cd FunctionalPlus && mkdir -p build && cd build && cmake .. && make && make install +RUN git clone -b 'v0.2.22' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus && cd FunctionalPlus && mkdir -p build && cd build && cmake .. && make && make install RUN git clone -b '3.4.0' --single-branch --depth 1 https://gitlab.com/libeigen/eigen.git && cd eigen && mkdir -p build && cd build && cmake .. && make && make install && ln -s /usr/local/include/eigen3/Eigen /usr/local/include/Eigen RUN git clone -b 'v3.10.5' --single-branch --depth 1 https://github.com/nlohmann/json && cd json && mkdir -p build && cd build && cmake -DJSON_BuildTests=OFF .. && make && make install