Merge iwth Haim change

Author: alonre24

opt/build/onnxruntime/Dockerfile.x64

@@ -10,14 +10,11 @@ ARG ONNXRUNTIME_VER=1.6.0
 ARG ARCH=x64
 
 RUN apt-get -qq update
-RUN apt-get -qq install -y curl wget tar git
-RUN apt-get -qq install -y build-essential cmake
-RUN apt-get -qq install -y libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev
-
-RUN apt-get -qq install -y python3 python3-pip python3-dev
+RUN apt-get -qq install -y curl wget tar git \
+            build-essential cmake \
+            libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev \
+            python3 python3-pip python3-dev python3-numpy
 RUN pip3 install --upgrade pip setuptools wheel
-# RUN pip3 install numpy
-RUN apt-get -q install -y python3-numpy
 
 ENV LANG=en_US.UTF-8
 RUN apt-get install -y locales && \
@@ -27,15 +24,17 @@ RUN apt-get install -y locales && \
 
 WORKDIR /build
 
-ADD ./pack.sh /build/
-ARG BUILDTYPE=Debug
+ARG BUILDTYPE=RelWithDebInfo
+
 ARG BUILDARGS="--config ${BUILDTYPE} --parallel"
 
-RUN git clone --single-branch --branch rel-${ONNXRUNTIME_VER} --recursive ${ONNXRUNTIME_REPO} onnxruntime
-	
-RUN	cd onnxruntime ;\
-	./build.sh ${BUILDARGS} --update --build ;\
-	./build.sh ${BUILDARGS} --build_shared_lib
+RUN git clone --single-branch --branch rel-${ONNXRUNTIME_VER} ${ONNXRUNTIME_REPO} onnxruntime
+WORKDIR /build/onnxruntime
+RUN git fetch --recurse-submodules -j4
+RUN ./build.sh ${BUILDARGS} --update --build
+RUN ./build.sh ${BUILDARGS} --build_shared_lib
 # RUN ./build.sh ${BUILDARGS} --enable_pybind --build_wheel
 
+ADD ./pack.sh /build
+WORKDIR /build
 RUN ./pack.sh ${ONNXRUNTIME_VER} ${ARCH}

opt/build/onnxruntime/Dockerfile.x64-gpu

@@ -8,21 +8,18 @@ ARG ONNXRUNTIME_VER=1.6.0
 ARG ARCH=x64-gpu
 
 RUN apt-get -qq update
-RUN apt-get -qq install -y curl wget tar git
-RUN apt-get -qq install -y build-essential
-RUN apt-get -qq install -y libcurl4-openssl-dev libssl-dev libatlas-base-dev zlib1g-dev
+RUN apt-get -qq install -y curl \
+            wget tar git build-essential \
+            libcurl4-openssl-dev libssl-dev \
+            libatlas-base-dev zlib1g-dev python3 python3-pip \
+            python3-dev python3-numpy rsync
 
-RUN apt-get -qq install -y python3 python3-pip python3-dev
 RUN pip3 install --upgrade pip setuptools wheel
-# RUN pip3 install numpy
-RUN apt-get -q install -y python3-numpy
-RUN apt-get install -y snapd
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.15.2/cmake-3.15.2.tar.gz; \
-    tar -zxvf cmake-3.15.2.tar.gz; \
-    cd cmake-3.15.2; \
-    ./bootstrap; \
-    make -j4; \
-    make install
+
+RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.19.5/cmake-3.19.5-Linux-x86_64.tar.gz -O /tmp/cmake.tgz
+WORKDIR /tmp
+RUN tar -xpf cmake.tgz
+RUN rsync -aqH cmake*/* /usr
 
 
 ENV LANG=en_US.UTF-8
@@ -33,15 +30,14 @@ RUN apt-get install -y locales && \
 
 WORKDIR /build
 
-ADD ./pack.sh /build/
 ARG BUILDTYPE=MinSizeRel
 ARG BUILDARGS="--config ${BUILDTYPE} --parallel"
 
-RUN git clone --single-branch --branch rel-${ONNXRUNTIME_VER} --recursive ${ONNXRUNTIME_REPO} onnxruntime
-
+RUN git clone --single-branch --branch rel-${ONNXRUNTIME_VER} ${ONNXRUNTIME_REPO} onnxruntime
+WORKDIR /build/onnxruntime
+RUN git fetch --recurse-submodules -j4
+RUN ./build.sh ${BUILDARGS} --update --build --use_cuda --cudnn_home /usr/local/cuda --cuda_home /usr/local/cuda --build_shared_lib --parallel
 
-RUN	cd onnxruntime ;\
-    ./build.sh ${BUILDARGS} --update --build --use_cuda --cudnn_home /usr/local/cuda --cuda_home /usr/local/cuda --build_shared_lib --parallel
-# RUN ./build.sh ${BUILDARGS} --enable_pybind --build_wheel
-
-RUN ./pack.sh ${ONNXRUNTIME_VER} ${ARCH}
+ADD ./pack.sh /build/
+WORKDIR /build
+RUN /pack.sh ${ONNXRUNTIME_VER} ${ARCH}

src/backends/onnxruntime.c

@@ -329,7 +329,7 @@ RAI_Model *RAI_ModelCreateORT(RAI_Backend backend, const char *devicestr, RAI_Mo
     }
 
     // TODO: these options could be configured at the AI.CONFIG level
-    //ONNX_VALIDATE_STATUS(ort->SetSessionGraphOptimizationLevel(session_options, 1))
+    // ONNX_VALIDATE_STATUS(ort->SetSessionGraphOptimizationLevel(session_options, 1))
     ONNX_VALIDATE_STATUS(
         ort->SetIntraOpNumThreads(session_options, (int)opts.backends_intra_op_parallelism))
     ONNX_VALIDATE_STATUS(