Merge pull request #2784 from mqcmd196/ofa_docker_build

fix ofa docker build

jsk_perception/docker/clip/Dockerfile

@@ -7,8 +7,9 @@ RUN apt -o Acquire::AllowInsecureRepositories=true update \
     libopencv-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
-RUN pip install flask opencv-python\
-    && pip install ftfy regex tqdm # pip deps of CLIP
+# use requirements.txt generetaed by `pip freeze | grep ==` in the container created on 2023-03-31
+COPY requirements.txt /tmp/requirements.txt
+RUN pip install -r /tmp/requirements.txt
 RUN pip install git+https://github.com/openai/CLIP.git
 RUN mkdir -p /workspace/Clip
 COPY server.py /workspace/Clip

jsk_perception/docker/clip/requirements.txt

@@ -0,0 +1,31 @@
+backcall==0.2.0
+brotlipy==0.7.0
+certifi==2020.12.5
+click==8.1.3
+conda==4.9.2
+conda-build==3.21.4
+decorator==4.4.2
+dnspython==2.1.0
+Flask==2.2.3
+ftfy==6.1.1
+importlib-metadata==6.1.0
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.2
+mkl-fft==1.2.0
+mkl-random==1.1.1
+mkl-service==2.3.0
+olefile==0.46
+opencv-python==4.7.0.72
+parso==0.7.0
+pkginfo==1.7.0
+pycosat==0.6.3
+python-etcd==0.4.5
+PyYAML==5.3.1
+regex==2023.3.23
+ruamel-yaml==0.15.87
+torch==1.7.1
+torchelastic==0.2.1
+torchvision==0.8.2
+Werkzeug==2.2.3
+zipp==3.15.0

jsk_perception/docker/ofa/Dockerfile

@@ -7,10 +7,14 @@ RUN apt -o Acquire::AllowInsecureRepositories=true update \
     libopencv-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
+# use requirements.txt generetaed by `pip freeze | grep ==` in the container created on 2023-03-31
+COPY requirements.txt /tmp/requirements.txt
+RUN sed -i 's/pycocotools==2\.0\.4/pycocotools==2.0.6/g' /tmp/requirements.txt && pip install -r /tmp/requirements.txt
 RUN git clone https://github.com/OFA-Sys/OFA \
     && mkdir -p /var/mount
 RUN cd OFA \
     && git checkout 1809b55 \
+    && sed -i 's/pycocotools==2\.0\.4/pycocotools==2.0.6/g' requirements.txt \
     && pip install -r requirements.txt \
     && pip install "protobuf<3.20.0" "numpy>=1.20.3,<1.24" "pytorch-lightning==1.7.7" "torch==1.8.1" flask
 COPY server.py /workspace/OFA

jsk_perception/docker/ofa/requirements.txt

@@ -0,0 +1,96 @@
+absl-py==1.4.0
+aiohttp==3.8.4
+aiosignal==1.3.1
+antlr4-python3-runtime==4.8
+async-timeout==4.0.2
+attrs==22.2.0
+bitarray==2.7.3
+brotlipy==0.7.0
+cachetools==5.3.0
+certifi==2020.12.5
+charset-normalizer==3.1.0
+click==8.1.3
+colorama==0.4.6
+conda==4.9.2
+conda-build==3.21.4
+contourpy==1.0.7
+cycler==0.11.0
+Cython==0.29.33
+datasets==2.11.0
+dill==0.3.6
+dnspython==2.1.0
+einops==0.6.0
+Flask==2.2.3
+fonttools==4.39.3
+frozenlist==1.3.3
+fsspec==2023.3.0
+ftfy==6.0.3
+google-auth==2.17.1
+google-auth-oauthlib==0.4.6
+grpcio==1.53.0
+huggingface-hub==0.13.3
+hydra-core==1.0.7
+importlib-metadata==6.1.0
+importlib-resources==5.12.0
+itsdangerous==2.1.2
+jedi==0.17.0
+Jinja2==3.1.2
+joblib==1.2.0
+kiwisolver==1.4.4
+lightning-utilities==0.8.0
+lxml==4.9.2
+Markdown==3.4.3
+MarkupSafe==2.1.2
+matplotlib==3.7.1
+mkl-fft==1.3.0
+mkl-random==1.1.1
+mkl-service==2.3.0
+multidict==6.0.4
+multiprocess==0.70.14
+nltk==3.8.1
+numpy==1.23.5
+oauthlib==3.2.2
+olefile==0.46
+omegaconf==2.0.6
+opencv-python==4.7.0.72
+packaging==23.0
+pandas==1.5.3
+pkginfo==1.7.0
+portalocker==2.7.0
+protobuf==3.19.6
+pyarrow==11.0.0
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pycocoevalcap==1.2
+pycocotools==2.0.4
+pycosat==0.6.3
+pyDeprecate==0.3.2
+pyparsing==3.0.9
+python-dateutil==2.8.2
+python-etcd==0.4.5
+pytorch-lightning==1.7.7
+PyYAML==5.4.1
+regex==2023.3.23
+requests-oauthlib==1.3.1
+responses==0.18.0
+rouge-score==0.1.2
+rsa==4.9
+ruamel-yaml==0.15.87
+sacrebleu==2.3.1
+tabulate==0.9.0
+tensorboard==2.12.0
+tensorboard-data-server==0.7.0
+tensorboard-plugin-wit==1.8.1
+tensorboardX==2.4.1
+timm==0.6.13
+torch==1.8.1
+torchelastic==0.2.2
+torchmetrics==0.11.4
+torchtext==0.9.1
+torchvision==0.9.1
+tqdm==4.65.0
+typing-extensions==4.5.0
+Werkzeug==2.2.3
+xxhash==3.2.0
+yarl==1.8.2
+zipp==3.15.0