From c42b50bf84f60b724d8c0015d33274533fb77ebe Mon Sep 17 00:00:00 2001 From: Huy Do Date: Tue, 25 Jul 2023 11:41:30 -0700 Subject: [PATCH 1/3] Install flatbuffers from conda defaults --- .ci/docker/common/install_conda.sh | 2 +- .ci/docker/conda-env-ci.yml | 4 ++++ .ci/docker/requirements-ci.txt | 1 - .ci/docker/ubuntu/Dockerfile | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .ci/docker/conda-env-ci.yml diff --git a/.ci/docker/common/install_conda.sh b/.ci/docker/common/install_conda.sh index 2d6dd4cf2f4..d90c0f2ce95 100755 --- a/.ci/docker/common/install_conda.sh +++ b/.ci/docker/common/install_conda.sh @@ -27,7 +27,7 @@ install_miniconda() { install_python() { pushd /opt/conda # Install the correct Python version - as_ci_user conda create -n "py_${PYTHON_VERSION}" -y python="${PYTHON_VERSION}" + as_ci_user conda create -n "py_${PYTHON_VERSION}" -y --file /opt/conda/conda-env-ci.yml python="${PYTHON_VERSION}" popd } diff --git a/.ci/docker/conda-env-ci.yml b/.ci/docker/conda-env-ci.yml new file mode 100644 index 00000000000..81e1c5b4ee5 --- /dev/null +++ b/.ci/docker/conda-env-ci.yml @@ -0,0 +1,4 @@ +channels: + - defaults +dependencies: + - flatbuffers=2.0.0 diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index 9b35a5621b9..23479ed2bd4 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -1,4 +1,3 @@ -flatbuffers==2.0 mpmath==1.3.0 PyYAML==6.0.1 ruamel.yaml==0.17.32 diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile index 117c4fd1a15..bdaad60ca63 100644 --- a/.ci/docker/ubuntu/Dockerfile +++ b/.ci/docker/ubuntu/Dockerfile @@ -29,9 +29,10 @@ ARG PYTHON_VERSION ENV PYTHON_VERSION=$PYTHON_VERSION ENV PATH /opt/conda/envs/py_$PYTHON_VERSION/bin:/opt/conda/bin:$PATH COPY requirements-ci.txt /opt/conda/ +COPY conda-env-ci.yml /opt/conda/ COPY ./common/install_conda.sh install_conda.sh COPY ./common/utils.sh utils.sh -RUN bash ./install_conda.sh && rm install_conda.sh utils.sh /opt/conda/requirements-ci.txt +RUN bash ./install_conda.sh && rm install_conda.sh utils.sh /opt/conda/requirements-ci.txt /opt/conda/conda-env-ci.yml USER ci-user CMD ["bash"] From 2fda36ff1c8f89321223feed6572b44a128d4bdd Mon Sep 17 00:00:00 2001 From: Huy Do Date: Tue, 25 Jul 2023 11:50:33 -0700 Subject: [PATCH 2/3] Update format --- .ci/docker/common/install_conda.sh | 2 +- .ci/docker/conda-env-ci.txt | 1 + .ci/docker/conda-env-ci.yml | 4 ---- .ci/docker/ubuntu/Dockerfile | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 .ci/docker/conda-env-ci.txt delete mode 100644 .ci/docker/conda-env-ci.yml diff --git a/.ci/docker/common/install_conda.sh b/.ci/docker/common/install_conda.sh index d90c0f2ce95..5dd5582267d 100755 --- a/.ci/docker/common/install_conda.sh +++ b/.ci/docker/common/install_conda.sh @@ -27,7 +27,7 @@ install_miniconda() { install_python() { pushd /opt/conda # Install the correct Python version - as_ci_user conda create -n "py_${PYTHON_VERSION}" -y --file /opt/conda/conda-env-ci.yml python="${PYTHON_VERSION}" + as_ci_user conda create -n "py_${PYTHON_VERSION}" -y --file /opt/conda/conda-env-ci.txt python="${PYTHON_VERSION}" popd } diff --git a/.ci/docker/conda-env-ci.txt b/.ci/docker/conda-env-ci.txt new file mode 100644 index 00000000000..918601605ea --- /dev/null +++ b/.ci/docker/conda-env-ci.txt @@ -0,0 +1 @@ +flatbuffers=2.0.0 diff --git a/.ci/docker/conda-env-ci.yml b/.ci/docker/conda-env-ci.yml deleted file mode 100644 index 81e1c5b4ee5..00000000000 --- a/.ci/docker/conda-env-ci.yml +++ /dev/null @@ -1,4 +0,0 @@ -channels: - - defaults -dependencies: - - flatbuffers=2.0.0 diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile index bdaad60ca63..bfd4b9aa3f7 100644 --- a/.ci/docker/ubuntu/Dockerfile +++ b/.ci/docker/ubuntu/Dockerfile @@ -29,10 +29,10 @@ ARG PYTHON_VERSION ENV PYTHON_VERSION=$PYTHON_VERSION ENV PATH /opt/conda/envs/py_$PYTHON_VERSION/bin:/opt/conda/bin:$PATH COPY requirements-ci.txt /opt/conda/ -COPY conda-env-ci.yml /opt/conda/ +COPY conda-env-ci.txt /opt/conda/ COPY ./common/install_conda.sh install_conda.sh COPY ./common/utils.sh utils.sh -RUN bash ./install_conda.sh && rm install_conda.sh utils.sh /opt/conda/requirements-ci.txt /opt/conda/conda-env-ci.yml +RUN bash ./install_conda.sh && rm install_conda.sh utils.sh /opt/conda/requirements-ci.txt /opt/conda/conda-env-ci.txt USER ci-user CMD ["bash"] From 244ed67925077a6cf2a47776facc6008339a7231 Mon Sep 17 00:00:00 2001 From: Huy Do Date: Tue, 25 Jul 2023 18:44:12 -0700 Subject: [PATCH 3/3] Add TODO comment --- .ci/docker/conda-env-ci.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/docker/conda-env-ci.txt b/.ci/docker/conda-env-ci.txt index 918601605ea..467bac5e422 100644 --- a/.ci/docker/conda-env-ci.txt +++ b/.ci/docker/conda-env-ci.txt @@ -1 +1,3 @@ +# TODO: We might need to update this to install flatbuffers from the pinned commit +# in fbcode/executorch/third-party/flatbuffers.submodule.txt flatbuffers=2.0.0