Fix mistakenly master-merged disabling of several packages

centos/Dockerfile

@@ -319,94 +319,94 @@ RUN yum install -y \
     cd .. && \
     rm -rf opencv-${OpenCV_VERSION}* opencv_contrib-${OpenCV_VERSION}*
 
-# # MXNet
-# ENV MXNet_DIR=/opt/mxnet-1.6.0
-# ADD patches/mxnet-1.6.0-manual-cuda-arch-flags.patch /opt/mxnet-1.6.0-manual-cuda-arch-flags.patch
-# RUN version=1.6.0 && \
-#     source /etc/profile && \
-#     source scl_source enable devtoolset-8 && \
-#     cd /opt && \
-#     curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz && \
-#     tar -xf apache-mxnet-src-${version}-incubating.tar.gz && \
-#     rm -f apache-mxnet-src-${version}-incubating.tar.gz && \
-#     mv apache-mxnet-src-${version}-incubating mxnet-${version} && \
-#     cd mxnet-${version} && \
-#     patch -p1 -i /opt/mxnet-1.6.0-manual-cuda-arch-flags.patch && \
-#     cmake  -S. -B build -G Ninja \
-#         -D CMAKE_CXX_STANDARD=14 -D USE_CXX14_IF_AVAILABLE=ON \
-#         -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/usr/local \
-#         -D CMAKE_CUDA_COMPILER=/usr/local/cuda-10.1/bin/nvcc \
-#         -D USE_CUDA=ON -D USE_CUDNN=ON -D USE_NCCL=OFF \
-#         -D CUDA_ARCH_FLAGS="-gencode;arch=compute_61,code=sm_61;-gencode;arch=compute_30,code=compute_30;-gencode;arch=compute_52,code=compute_52;-gencode;arch=compute_75,code=compute_75" \
-#         -D USE_OPENCV=ON -D USE_OPENMP=ON \
-#         -D USE_LAPACK=ON -D USE_MKL_IF_AVAILABLE=OFF \
-#         -D USE_DIST_KVSTORE=OFF \
-#         -D USE_CPP_PACKAGE=ON \
-#         -D USE_SIGNAL_HANDLER=ON \
-#         -D ENABLE_CUDA_RTC=ON \
-#         -D BUILD_CPP_EXAMPLES=OFF \
-#         -D USE_GPERFTOOLS=OFF \
-#         -D USE_JEMALLOC=OFF \
-#         && \
-#     rm /opt/mxnet-1.6.0-manual-cuda-arch-flags.patch && \
-#     ninja -C build
-
-# # pybind11
-# ARG pybind11_VERSION=2.7.1
-# RUN source /etc/profile && \
-#     cd /tmp && \
-#     curl -sSL -o pybind11-${pybind11_VERSION}.tar.gz https://github.com/pybind/pybind11/archive/v${pybind11_VERSION}.tar.gz && \
-#     tar -xf pybind11-${pybind11_VERSION}.tar.gz && \
-#     cd pybind11-${pybind11_VERSION} && \
-#     cmake -S. -B build -G Ninja \
-#         -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
-#         -DPYBIND11_TEST=off \
-#         && \
-#     ninja -C build install && \
-#     cd .. && \
-#     rm -rf pybind11-${pybind11_VERSION}*
-
-# # pylon (Basler cameras)
-# ARG pylon_VERSION=5.2.0.13457
-# RUN cd /tmp && \
-#     curl -sSLO https://www.baslerweb.com/fp-1551786516/media/downloads/software/pylon_software/pylon-${pylon_VERSION}-x86_64.tar.gz && \
-#     tar -xf pylon-${pylon_VERSION}-x86_64.tar.gz && \
-#     cd pylon-${pylon_VERSION}-x86_64 && \
-#     tar -xf pylonSDK-${pylon_VERSION}-x86_64.tar.gz && \
-#     mv pylon5 /opt/pylon5 && \
-#     cd .. && \
-#     rm -rf pylon-${pylon_VERSION}*
-# ADD bash/pylon.sh /etc/profile.d/pylon.sh
-
-# # CGAL
-# ARG CGAL_VERSION=5.2
-# RUN yum install -y \
-#         gmp-devel \
-#         mpfr-devel \
-#         && \
-#     yum clean all && \
-#     source /etc/profile && \
-#     cd /tmp && \
-#     curl -sSLO https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/CGAL-${CGAL_VERSION}.tar.xz && \
-#     tar -xf CGAL-${CGAL_VERSION}.tar.xz && \
-#     cd CGAL-${CGAL_VERSION} && \
-#     cmake -S. -B build -G Ninja \
-#         -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
-#         -DCGAL_INSTALL_LIB_DIR=lib -DCGAL_INSTALL_CMAKE_DIR="lib/cmake/CGAL" \
-#         -DWITH_CGAL_Qt5=ON \
-#         && \
-#     ninja -C build install && \
-#     cd .. && \
-#     rm -rf CGAL-${CGAL_VERSION}*
-
-# # glm
-# ARG glm_VERSION=0.9.9.8
-# RUN cd /tmp && \
-#     curl -sSLO https://github.com/g-truc/glm/releases/download/${glm_VERSION}/glm-${glm_VERSION}.zip && \
-#     unzip glm-${glm_VERSION}.zip && \
-#     mv glm /opt/glm && \
-#     rm -rf glm* && \
-#     echo "export glm_DIR=/opt/glm/cmake/glm" > /etc/profile.d/glm.sh
+# MXNet
+ENV MXNet_DIR=/opt/mxnet-1.6.0
+ADD patches/mxnet-1.6.0-manual-cuda-arch-flags.patch /opt/mxnet-1.6.0-manual-cuda-arch-flags.patch
+RUN version=1.6.0 && \
+    source /etc/profile && \
+    source scl_source enable devtoolset-8 && \
+    cd /opt && \
+    curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz && \
+    tar -xf apache-mxnet-src-${version}-incubating.tar.gz && \
+    rm -f apache-mxnet-src-${version}-incubating.tar.gz && \
+    mv apache-mxnet-src-${version}-incubating mxnet-${version} && \
+    cd mxnet-${version} && \
+    patch -p1 -i /opt/mxnet-1.6.0-manual-cuda-arch-flags.patch && \
+    cmake  -S. -B build -G Ninja \
+        -D CMAKE_CXX_STANDARD=14 -D USE_CXX14_IF_AVAILABLE=ON \
+        -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/usr/local \
+        -D CMAKE_CUDA_COMPILER=/usr/local/cuda-10.1/bin/nvcc \
+        -D USE_CUDA=ON -D USE_CUDNN=ON -D USE_NCCL=OFF \
+        -D CUDA_ARCH_FLAGS="-gencode;arch=compute_61,code=sm_61;-gencode;arch=compute_30,code=compute_30;-gencode;arch=compute_52,code=compute_52;-gencode;arch=compute_75,code=compute_75" \
+        -D USE_OPENCV=ON -D USE_OPENMP=ON \
+        -D USE_LAPACK=ON -D USE_MKL_IF_AVAILABLE=OFF \
+        -D USE_DIST_KVSTORE=OFF \
+        -D USE_CPP_PACKAGE=ON \
+        -D USE_SIGNAL_HANDLER=ON \
+        -D ENABLE_CUDA_RTC=ON \
+        -D BUILD_CPP_EXAMPLES=OFF \
+        -D USE_GPERFTOOLS=OFF \
+        -D USE_JEMALLOC=OFF \
+        && \
+    rm /opt/mxnet-1.6.0-manual-cuda-arch-flags.patch && \
+    ninja -C build
+
+# pybind11
+ARG pybind11_VERSION=2.7.1
+RUN source /etc/profile && \
+    cd /tmp && \
+    curl -sSL -o pybind11-${pybind11_VERSION}.tar.gz https://github.com/pybind/pybind11/archive/v${pybind11_VERSION}.tar.gz && \
+    tar -xf pybind11-${pybind11_VERSION}.tar.gz && \
+    cd pybind11-${pybind11_VERSION} && \
+    cmake -S. -B build -G Ninja \
+        -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DPYBIND11_TEST=off \
+        && \
+    ninja -C build install && \
+    cd .. && \
+    rm -rf pybind11-${pybind11_VERSION}*
+
+# pylon (Basler cameras)
+ARG pylon_VERSION=5.2.0.13457
+RUN cd /tmp && \
+    curl -sSLO https://www.baslerweb.com/fp-1551786516/media/downloads/software/pylon_software/pylon-${pylon_VERSION}-x86_64.tar.gz && \
+    tar -xf pylon-${pylon_VERSION}-x86_64.tar.gz && \
+    cd pylon-${pylon_VERSION}-x86_64 && \
+    tar -xf pylonSDK-${pylon_VERSION}-x86_64.tar.gz && \
+    mv pylon5 /opt/pylon5 && \
+    cd .. && \
+    rm -rf pylon-${pylon_VERSION}*
+ADD bash/pylon.sh /etc/profile.d/pylon.sh
+
+# CGAL
+ARG CGAL_VERSION=5.2
+RUN yum install -y \
+        gmp-devel \
+        mpfr-devel \
+        && \
+    yum clean all && \
+    source /etc/profile && \
+    cd /tmp && \
+    curl -sSLO https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/CGAL-${CGAL_VERSION}.tar.xz && \
+    tar -xf CGAL-${CGAL_VERSION}.tar.xz && \
+    cd CGAL-${CGAL_VERSION} && \
+    cmake -S. -B build -G Ninja \
+        -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DCGAL_INSTALL_LIB_DIR=lib -DCGAL_INSTALL_CMAKE_DIR="lib/cmake/CGAL" \
+        -DWITH_CGAL_Qt5=ON \
+        && \
+    ninja -C build install && \
+    cd .. && \
+    rm -rf CGAL-${CGAL_VERSION}*
+
+# glm
+ARG glm_VERSION=0.9.9.8
+RUN cd /tmp && \
+    curl -sSLO https://github.com/g-truc/glm/releases/download/${glm_VERSION}/glm-${glm_VERSION}.zip && \
+    unzip glm-${glm_VERSION}.zip && \
+    mv glm /opt/glm && \
+    rm -rf glm* && \
+    echo "export glm_DIR=/opt/glm/cmake/glm" > /etc/profile.d/glm.sh
 
 RUN python3.6 -m pip --no-cache-dir install -U pip && \
     python3.6 -m pip --no-cache-dir install 'cryptography<3.4' &&  \