Merge pull request #177 from IBM/ntl_update_perf

Updated NTL version and added perf option

Author: boland25

.gitignore

@@ -11,7 +11,7 @@ FHE-Workspace
 
 # Block dependencies that are automatically fetched in the build script
 DEPENDENCIES/NTL
-DEPENDENCIES/ntl-11.4.3.tar.gz
+DEPENDENCIES/ntl-*.tar.gz
 
 DEPENDENCIES/HElib
 DEPENDENCIES/HElib-v1.0.2.tar.gz

ConfigConstants.sh

@@ -25,7 +25,7 @@
 #Current versions we build against
 #
 # NTL Library 
-NTL_version='11.4.3'
+NTL_version='11.5.1'
 #HELib Library
 HElib_version='v2.1.0'
 HElib_cmake_lists_version='2.1.0'

Dockerfile.ALPINE-s390x.Toolkit

@@ -15,13 +15,15 @@ USER root
 WORKDIR /root
 
 # Install pre-reqs for building code-server
-RUN apk add --no-cache openssl python3 pkgconfig xterm libx11-dev libxkbfile-dev libsecret-dev nodejs yarn
+RUN apk add --no-cache openssl python3 pkgconfig xterm libx11-dev libxkbfile-dev libsecret-dev 
+RUN apk add nodejs yarn
 
 # Install code-server so we can access vscode from a container context...
 RUN yarn global add node-gyp 
 RUN yarn global add node-pty 
-RUN yarn global add code-server
+#RUN yarn global add code-server
 
+RUN curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 3.9.1
 # Create a directory to hold the VSCode user data when running as root
 RUN mkdir -p /opt/IBM/IDE-Data
 RUN chown -R fhe:fhe /opt/IBM/IDE-Data

Dockerfile.ALPINE.HElib

@@ -35,7 +35,7 @@ RUN mkdir -p /opt/IBM/FHE-distro
 COPY ./DEPENDENCIES/NTL                /opt/IBM/FHE-distro/NTL
 WORKDIR /opt/IBM/FHE-distro/NTL
 RUN cd ./src && \
-    ./configure SHARED=on NTL_GMP_LIP=on NTL_THREADS=on NTL_THREAD_BOOST=on && \
+    ./configure SHARED=on NTL_GMP_LIP=on NTL_THREADS=on NTL_THREAD_BOOST=on NTL_RANDOM_AES256CTR=on && \
     make -j4 && \
     make install && \
     ldconfig / && \

Dockerfile.CENTOS.HElib

@@ -51,7 +51,7 @@ RUN mkdir -p /opt/IBM/FHE-distro
 COPY ./DEPENDENCIES/NTL                /opt/IBM/FHE-distro/NTL
 WORKDIR /opt/IBM/FHE-distro/NTL
 RUN cd ./src && \
-    ./configure SHARED=on NTL_GMP_LIP=on NTL_THREADS=on NTL_THREAD_BOOST=on && \
+    ./configure SHARED=on NTL_GMP_LIP=on NTL_THREADS=on NTL_THREAD_BOOST=on NTL_RANDOM_AES256CTR=on && \
     make -j4 && \
     make install && \
     ldconfig && \

Dockerfile.FEDORA-s390x.Toolkit

@@ -27,13 +27,14 @@ RUN yum -y install \
 RUN yum clean packages
 
 # Istall Node.js v12+
-RUN curl -fsSL https://nodejs.org/dist/v12.18.2/node-v12.18.2-linux-s390x.tar.xz | tar --no-same-owner -Jxf -
-RUN cp -pr ./node-v12.18.2-linux-s390x/bin     \
-           ./node-v12.18.2-linux-s390x/include \
-           ./node-v12.18.2-linux-s390x/lib     \
-           ./node-v12.18.2-linux-s390x/share   \
+RUN curl -fsSL https://nodejs.org/dist/v14.17.3/node-v14.17.3-linux-s390x.tar.xz | tar --no-same-owner -Jxf -
+RUN cp -pr ./node-v14.17.3-linux-s390x/bin     \
+           ./node-v14.17.3-linux-s390x/include \
+           ./node-v14.17.3-linux-s390x/lib     \
+           ./node-v14.17.3-linux-s390x/share   \
            /usr/local
 
+RUN npm install --global yarn
 # Install code-server so we can access vscode from a container context...
 #RUN curl -fsSL https://code-server.dev/install.sh | sh 2>&1
 RUN curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 3.9.1

Dockerfile.FEDORA.HElib

@@ -39,7 +39,7 @@ RUN mkdir -p /opt/IBM/FHE-distro
 COPY ./DEPENDENCIES/NTL                /opt/IBM/FHE-distro/NTL
 WORKDIR /opt/IBM/FHE-distro/NTL
 RUN cd ./src && \
-    ./configure SHARED=on NTL_GMP_LIP=on NTL_THREADS=on NTL_THREAD_BOOST=on && \
+    ./configure SHARED=on NTL_GMP_LIP=on NTL_THREADS=on NTL_THREAD_BOOST=on NTL_RANDOM_AES256CTR=on && \
     make -j4 && \
     make install && \
     ldconfig && \

Dockerfile.UBUNTU-s390x.Toolkit

@@ -28,13 +28,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt install -y \
     libsecret-1-dev
 
 # Istall Node.js v12+
-RUN curl -fsSL https://nodejs.org/dist/v12.18.2/node-v12.18.2-linux-s390x.tar.xz | tar --no-same-owner -Jxf -
-RUN cp -pr ./node-v12.18.2-linux-s390x/bin     \
-           ./node-v12.18.2-linux-s390x/include \
-           ./node-v12.18.2-linux-s390x/lib     \
-           ./node-v12.18.2-linux-s390x/share   \
+RUN curl -fsSL https://nodejs.org/dist/v14.17.3/node-v14.17.3-linux-s390x.tar.xz | tar --no-same-owner -Jxf -
+RUN cp -pr ./node-v14.17.3-linux-s390x/bin     \
+           ./node-v14.17.3-linux-s390x/include \
+           ./node-v14.17.3-linux-s390x/lib     \
+           ./node-v14.17.3-linux-s390x/share   \
            /usr/local
 
+RUN npm install --global yarn
 # Install code-server so we can access vscode from a container context...
 #RUN curl -fsSL https://code-server.dev/install.sh | sh 2>&1
 RUN curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 3.9.1 2>&1

Dockerfile.UBUNTU.HElib

@@ -64,7 +64,7 @@ RUN mkdir -p /opt/IBM/FHE-distro
 COPY ./DEPENDENCIES/NTL                /opt/IBM/FHE-distro/NTL
 WORKDIR /opt/IBM/FHE-distro/NTL
 RUN cd ./src && \
-    ./configure SHARED=on NTL_GMP_LIP=on NTL_THREADS=on NTL_THREAD_BOOST=on && \
+    ./configure SHARED=on NTL_GMP_LIP=on NTL_THREADS=on NTL_THREAD_BOOST=on NTL_RANDOM_AES256CTR=on && \
     make -j4 && \
     make install && \
     ldconfig && \

scripts/jenkins/fhe_docker_jenkins_trigger_pr_tests.sh

@@ -66,7 +66,7 @@ if [[ "$BUILD_TYPE" == "S390" ]]; then
      echo 'S390 Stuff $BUILD_TYPE'
      test_toolkit "ubuntu"
      test_toolkit "fedora"
-     test_toolkit "alpine"
+     #test_toolkit "alpine"
 
 else 
      test_toolkit "ubuntu"