Update Dockerfile-cpu to force python3.9 (#7675)
Browse files* Update
* Update
* Do not install torch
* Pillow>9.1
* Update Dockerfile-cpu
* Update Dockerfile-cpu
* Update Dockerfile-cpu
* Update Dockerfile-cpu
* Update Dockerfile-cpu
* Update Dockerfile-cpu
* Update Dockerfile-cpu
* Update Dockerfile-cpu
* Update Dockerfile-cpu
* Update Dockerfile
* fix emoji
* reduce scipy
* add libpython3.9
* Update Dockerfile
- requirements.txt +1 -1
- utils/docker/Dockerfile +1 -2
- utils/docker/Dockerfile-cpu +10 -6
- utils/general.py +1 -1
requirements.txt
CHANGED
@@ -7,7 +7,7 @@ opencv-python>=4.1.1
|
|
7 |
Pillow>=7.1.2
|
8 |
PyYAML>=5.3.1
|
9 |
requests>=2.23.0
|
10 |
-
scipy>=1.
|
11 |
torch>=1.7.0
|
12 |
torchvision>=0.8.1
|
13 |
tqdm>=4.41.0
|
|
|
7 |
Pillow>=7.1.2
|
8 |
PyYAML>=5.3.1
|
9 |
requests>=2.23.0
|
10 |
+
scipy>=1.4.1 # Google Colab version
|
11 |
torch>=1.7.0
|
12 |
torchvision>=0.8.1
|
13 |
tqdm>=4.41.0
|
utils/docker/Dockerfile
CHANGED
@@ -6,13 +6,12 @@ FROM nvcr.io/nvidia/pytorch:21.10-py3
|
|
6 |
# Install linux packages
|
7 |
RUN apt update && apt install -y zip htop screen libgl1-mesa-glx
|
8 |
|
9 |
-
# Install
|
10 |
COPY requirements.txt .
|
11 |
RUN python -m pip install --upgrade pip
|
12 |
RUN pip uninstall -y torch torchvision torchtext
|
13 |
RUN pip install --no-cache -r requirements.txt albumentations wandb gsutil notebook \
|
14 |
torch==1.11.0+cu113 torchvision==0.12.0+cu113 -f https://download.pytorch.org/whl/cu113/torch_stable.html
|
15 |
-
# RUN pip install --no-cache -U torch torchvision
|
16 |
|
17 |
# Create working directory
|
18 |
RUN mkdir -p /usr/src/app
|
|
|
6 |
# Install linux packages
|
7 |
RUN apt update && apt install -y zip htop screen libgl1-mesa-glx
|
8 |
|
9 |
+
# Install pip packages
|
10 |
COPY requirements.txt .
|
11 |
RUN python -m pip install --upgrade pip
|
12 |
RUN pip uninstall -y torch torchvision torchtext
|
13 |
RUN pip install --no-cache -r requirements.txt albumentations wandb gsutil notebook \
|
14 |
torch==1.11.0+cu113 torchvision==0.12.0+cu113 -f https://download.pytorch.org/whl/cu113/torch_stable.html
|
|
|
15 |
|
16 |
# Create working directory
|
17 |
RUN mkdir -p /usr/src/app
|
utils/docker/Dockerfile-cpu
CHANGED
@@ -6,15 +6,19 @@ FROM ubuntu:latest
|
|
6 |
# Install linux packages
|
7 |
RUN apt update
|
8 |
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y tzdata
|
9 |
-
RUN apt install -y python3-pip git zip curl htop screen libgl1-mesa-glx libglib2.0-0
|
10 |
-
RUN alias python=python3
|
11 |
|
12 |
-
# Install
|
|
|
|
|
|
|
|
|
|
|
13 |
COPY requirements.txt .
|
14 |
-
RUN python3 -m pip install --upgrade pip
|
15 |
-
RUN pip install --no-cache -r requirements.txt albumentations gsutil notebook \
|
16 |
coremltools onnx onnx-simplifier onnxruntime openvino-dev tensorflow-cpu tensorflowjs \
|
17 |
-
torch
|
18 |
|
19 |
# Create working directory
|
20 |
RUN mkdir -p /usr/src/app
|
|
|
6 |
# Install linux packages
|
7 |
RUN apt update
|
8 |
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y tzdata
|
9 |
+
RUN apt install -y python3-pip git zip curl htop screen libgl1-mesa-glx libglib2.0-0 software-properties-common
|
|
|
10 |
|
11 |
+
# Install python3.9
|
12 |
+
RUN add-apt-repository ppa:deadsnakes/ppa -y
|
13 |
+
RUN apt install python3.9 python3.9-distutils libpython3.9 -y
|
14 |
+
# RUN alias python=python3.9
|
15 |
+
|
16 |
+
# Install pip packages
|
17 |
COPY requirements.txt .
|
18 |
+
RUN python3.9 -m pip install --upgrade pip
|
19 |
+
RUN python3.9 -m pip install --no-cache -r requirements.txt albumentations gsutil notebook \
|
20 |
coremltools onnx onnx-simplifier onnxruntime openvino-dev tensorflow-cpu tensorflowjs \
|
21 |
+
torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu
|
22 |
|
23 |
# Create working directory
|
24 |
RUN mkdir -p /usr/src/app
|
utils/general.py
CHANGED
@@ -467,7 +467,7 @@ def check_dataset(data, autodownload=True):
|
|
467 |
if val:
|
468 |
val = [Path(x).resolve() for x in (val if isinstance(val, list) else [val])] # val path
|
469 |
if not all(x.exists() for x in val):
|
470 |
-
LOGGER.info(emojis('\nDataset not found
|
471 |
if s and autodownload: # download script
|
472 |
t = time.time()
|
473 |
root = path.parent if 'path' in data else '..' # unzip directory i.e. '../'
|
|
|
467 |
if val:
|
468 |
val = [Path(x).resolve() for x in (val if isinstance(val, list) else [val])] # val path
|
469 |
if not all(x.exists() for x in val):
|
470 |
+
LOGGER.info(emojis('\nDataset not found ⚠, missing paths %s' % [str(x) for x in val if not x.exists()]))
|
471 |
if s and autodownload: # download script
|
472 |
t = time.time()
|
473 |
root = path.parent if 'path' in data else '..' # unzip directory i.e. '../'
|