Skip to content

Commit 60cabdd

Browse files
committed
Preliminary testing for 20211027 builds
1 parent 7dac63b commit 60cabdd

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

.dockerignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Core files
2+
.git*
3+
JetsonNano
4+
Builds-DockerHub.md
5+
LICENSE
6+
runDocker.sh
7+
test/
8+
# Build artifacts
9+
BuildInfo-*/
10+
*.log
11+
*.log.temp
12+
*.cmd

Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ SHELL := /bin/bash
33
.PHONY: all build_all actual_build build_prep
44

55
# Release to match data of Dockerfile and follow YYYYMMDD pattern
6-
CTO_RELEASE=20210812
6+
CTO_RELEASE=20211027
77

88
# Maximize build speed
99
CTO_NUMPROC := $(shell nproc --all)
@@ -32,7 +32,7 @@ MLTK_CHECK="yes"
3232
STABLE_CUDA9=9.2
3333
STABLE_CUDA10=10.2
3434
STABLE_CUDA11p=11.2.2
35-
STABLE_CUDA11l=11.4.1
35+
STABLE_CUDA11l=11.4.2
3636
# For CUDA11 it might be possible to upgrade some of the pre-installed libraries to their latest version, this will add significant space to the container
3737
# to do, uncomment the line below the empty string set
3838
CUDA11_APT_XTRA=""
@@ -47,8 +47,8 @@ DNN_ARCH_CUDA10=6.0,6.1,7.0,7.5
4747
DNN_ARCH_CUDA11=6.0,6.1,7.0,7.5,8.0,8.6
4848

4949
# According to https://opencv.org/releases/
50-
STABLE_OPENCV3=3.4.15
51-
STABLE_OPENCV4=4.5.3
50+
STABLE_OPENCV3=3.4.16
51+
STABLE_OPENCV4=4.5.4
5252

5353
# TF2 at minimum CUDA 10.1
5454
# TF2 CUDA11 minimum is 2.4.0
@@ -76,16 +76,17 @@ TF2_PYTHON=3.8
7676
# 20200615: numpy 1.19.0 breaks TF build
7777
# 20201204: numpy >= 1.19.0 still breaks build for TF 1.15.4 & 2.3.1
7878
# 20210211: numpy >= 1.19.0 breaks TF 1.15.5 + numpy >= 1.20 breaks TF 2.4.1
79+
# 20211027: TF 2.6.0 specifies TF 1.19 so keeping restriction
7980
TF1_NUMPY='numpy<1.19.0'
8081
TF2_NUMPY='numpy<1.20.0'
8182

8283
# PyTorch (from pip) using instructions from https://pytorch.org/
8384
# and https://pytorch.org/get-started/previous-versions/
8485
# 1.7.1 last version supported by 9.2
85-
PT_CPU="torch==1.9.0+cpu torchvision==0.10.0+cpu torchaudio==0.9.0 -f https://download.pytorch.org/whl/torch_stable.html"
86+
PT_CPU="torch==1.10.0+cpu torchvision==0.11.1+cpu torchaudio==0.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html"
8687
PT_CUDA9="torch==1.7.1+cu92 torchvision==0.8.2+cu92 torchaudio==0.7.2 -f https://download.pytorch.org/whl/torch_stable.html"
8788
PT_CUDA10="torch torchvision torchaudio"
88-
PT_CUDA11="torch==1.9.0+cu111 torchvision==0.10.0+cu111 torchaudio==0.9.0 -f https://download.pytorch.org/whl/torch_stable.html"
89+
PT_CUDA11="torch==1.10.0+cu113 torchvision==0.11.1+cu113 torchaudio==0.10.0+cu113 -f https://download.pytorch.org/whl/cu113/torch_stable.html"
8990

9091
##########
9192

ubuntu20.04/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FROM ${CTO_FROM}
1212
# Install system packages
1313
ARG DEBIAN_FRONTEND=noninteractive
1414
RUN apt-get update -y --fix-missing\
15-
&& apt-get install -y --no-install-recommends \
15+
&& apt-get install -y \
1616
apt-utils \
1717
locales \
1818
wget \
@@ -26,7 +26,7 @@ ENV LANG en_US.utf8
2626
##### TensorFlow
2727

2828
# Install system packages
29-
RUN apt-get install -y --no-install-recommends \
29+
RUN apt-get install -y \
3030
build-essential \
3131
checkinstall \
3232
cmake \
@@ -105,7 +105,7 @@ RUN curl -s -Lo /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/rele
105105
##### OpenCV
106106

107107
# Install system packages
108-
RUN apt-get install -y --no-install-recommends \
108+
RUN apt-get install -y \
109109
doxygen \
110110
file \
111111
gfortran \
@@ -142,8 +142,10 @@ RUN apt-get install -y --no-install-recommends \
142142
libopenblas-dev \
143143
libopencore-amrnb-dev \
144144
libopencore-amrwb-dev \
145+
libopenjp2-7 \
145146
libopenjp2-7-dev \
146147
libopenjp2-tools \
148+
libopenjpip-server \
147149
libpng-dev \
148150
libpostproc-dev \
149151
libprotobuf-dev \

0 commit comments

Comments
 (0)