From bdc2d751a479717fee4b79c33b95dd8edc0e82bf Mon Sep 17 00:00:00 2001 From: Austin Klein Date: Fri, 20 Oct 2023 19:40:37 -0700 Subject: [PATCH 1/4] Add matching newline --- run-quick.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run-quick.sh b/run-quick.sh index 8d78b6f..d7783fb 100755 --- a/run-quick.sh +++ b/run-quick.sh @@ -14,6 +14,7 @@ done OW_OUT_DIR=/home/ow/shared HOST_OUT_DIR=$PWD + version=$( Date: Fri, 20 Oct 2023 19:59:31 -0700 Subject: [PATCH 2/4] Use updated Sibernetic --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f08e50..71b5278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,9 +82,13 @@ RUN owm bundle remote --user add ow 'https://raw.githubusercontent.com/openworm/ ################################################################################ ######## Install Sibernetic for the worm body model -RUN git clone https://github.com/openworm/sibernetic.git && \ +# RUN git clone https://github.com/openworm/sibernetic.git && \ +# cd sibernetic && \ +# git checkout ow-0.9.3 # fixed to a specific branch + +RUN git clone https://github.com/austinklein/sibernetic.git && \ cd sibernetic && \ - git checkout ow-0.9.3 # fixed to a specific branch + git checkout ow-0.9.4 # fixed to a specific branch ################################################################################ From 1b8a268ad1e041b08c2cb510a59864cbdcd728f3 Mon Sep 17 00:00:00 2001 From: Austin Klein Date: Fri, 20 Oct 2023 20:37:26 -0700 Subject: [PATCH 3/4] Switch to AMDAPPSDK --- Dockerfile | 85 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 70 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71b5278..2b42bc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -102,21 +102,76 @@ ENV PYTHONPATH=$PYTHONPATH:$HOME/c302:$SIBERNETIC_HOME ################################################################################ ######## Install Intel OpenCL libraries needed for Sibernetic -RUN mkdir intel-opencl-tmp && \ - cd intel-opencl-tmp && \ - mkdir intel-opencl && \ - wget https://github.com/openworm/OpenWorm/raw/dev_inte/SRB5.0_linux64.zip && \ - unzip SRB5.0_linux64.zip && \ - tar -C intel-opencl -Jxf intel-opencl-r5.0-63503.x86_64.tar.xz && \ - tar -C intel-opencl -Jxf intel-opencl-devel-r5.0-63503.x86_64.tar.xz && \ - tar -C intel-opencl -Jxf intel-opencl-cpu-r5.0-63503.x86_64.tar.xz && \ - sudo cp -R intel-opencl/* / && \ - sudo ldconfig && \ - cd .. && \ - sudo rm -r intel-opencl-tmp - -RUN sudo cp -R /opt/intel/opencl/include/CL /usr/include/ && \ -sudo apt install -y ocl-icd-opencl-dev vim +# RUN mkdir intel-opencl-tmp && \ +# cd intel-opencl-tmp && \ +# mkdir intel-opencl && \ +# wget https://github.com/openworm/OpenWorm/raw/dev_inte/SRB5.0_linux64.zip && \ +# unzip SRB5.0_linux64.zip && \ +# tar -C intel-opencl -Jxf intel-opencl-r5.0-63503.x86_64.tar.xz && \ +# tar -C intel-opencl -Jxf intel-opencl-devel-r5.0-63503.x86_64.tar.xz && \ +# tar -C intel-opencl -Jxf intel-opencl-cpu-r5.0-63503.x86_64.tar.xz && \ +# sudo cp -R intel-opencl/* / && \ +# sudo ldconfig && \ +# cd .. && \ +# sudo rm -r intel-opencl-tmp + +# RUN sudo cp -R /opt/intel/opencl/include/CL /usr/include/ && \ + + + + + + +RUN wget https://master.dl.sourceforge.net/project/nicehashsgminerv5viptools/APP%20SDK%20A%20Complete%20Development%20Platform/AMD%20APP%20SDK%203.0%20for%2064-bit%20Linux/AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 +RUN tar -xf AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 + +RUN printf 'Y\n\n' | sudo ./AMD-APP-SDK-v3.0.130.136-GA-linux64.sh + +RUN echo "ls /usr/lib:" +RUN ls /usr/lib + +RUN echo "ls /usr/lib/x86_64-linux-gnu:" +RUN ls /usr/lib/x86_64-linux-gnu + + +RUN echo "ls /opt/AMDAPPSDK-3.0:" +RUN ls /opt/AMDAPPSDK-3.0 + +RUN echo "ls /opt/AMDAPPSDK-3.0/lib/x86_64:" +RUN ls /opt/AMDAPPSDK-3.0/lib/x86_64 + +RUN echo "ls /opt/AMDAPPSDK-3.0/bin:" +RUN ls /opt/AMDAPPSDK-3.0/bin + +RUN echo "ls /opt/AMDAPPSDK-3.0/include:" +RUN ls /opt/AMDAPPSDK-3.0/include + + + + + + + + + + +RUN echo "sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libOpenCL.so.1 /usr/lib/libOpenCL.so.1" +RUN sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libOpenCL.so.1 /usr/lib/libOpenCL.so.1 +RUN echo "sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libamdocl64.so /usr/lib/libamdocl64.so" +RUN sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libamdocl64.so /usr/lib/libamdocl64.so + + + + + + + + +RUN sudo apt install -y ocl-icd-opencl-dev vim + +RUN echo "CLINFO:" +RUN clinfo + #sudo ln -s /opt/intel/opencl/libOpenCL.so.1 /usr/lib/libOpenCL.so From 127e6e32299e46a530d585ef26bb901908c1e84b Mon Sep 17 00:00:00 2001 From: Austin Klein Date: Thu, 26 Oct 2023 21:29:21 -0700 Subject: [PATCH 4/4] Clean up Dockerfile --- Dockerfile | 51 ++++++--------------------------------------------- run-quick.sh | 1 - 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b42bc5..a2b397b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -102,6 +102,7 @@ ENV PYTHONPATH=$PYTHONPATH:$HOME/c302:$SIBERNETIC_HOME ################################################################################ ######## Install Intel OpenCL libraries needed for Sibernetic +# Legacy install of Intel's OpenCL Drivers: # RUN mkdir intel-opencl-tmp && \ # cd intel-opencl-tmp && \ # mkdir intel-opencl && \ @@ -116,64 +117,24 @@ ENV PYTHONPATH=$PYTHONPATH:$HOME/c302:$SIBERNETIC_HOME # sudo rm -r intel-opencl-tmp # RUN sudo cp -R /opt/intel/opencl/include/CL /usr/include/ && \ +# sudo apt install -y ocl-icd-opencl-dev vim +# #sudo ln -s /opt/intel/opencl/libOpenCL.so.1 /usr/lib/libOpenCL.so - - - - - +# Install AMD's OpenCL Drivers (AMD-APP-SDK 3.0): RUN wget https://master.dl.sourceforge.net/project/nicehashsgminerv5viptools/APP%20SDK%20A%20Complete%20Development%20Platform/AMD%20APP%20SDK%203.0%20for%2064-bit%20Linux/AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 RUN tar -xf AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 - RUN printf 'Y\n\n' | sudo ./AMD-APP-SDK-v3.0.130.136-GA-linux64.sh -RUN echo "ls /usr/lib:" -RUN ls /usr/lib - -RUN echo "ls /usr/lib/x86_64-linux-gnu:" -RUN ls /usr/lib/x86_64-linux-gnu - - -RUN echo "ls /opt/AMDAPPSDK-3.0:" -RUN ls /opt/AMDAPPSDK-3.0 - -RUN echo "ls /opt/AMDAPPSDK-3.0/lib/x86_64:" -RUN ls /opt/AMDAPPSDK-3.0/lib/x86_64 - -RUN echo "ls /opt/AMDAPPSDK-3.0/bin:" -RUN ls /opt/AMDAPPSDK-3.0/bin - -RUN echo "ls /opt/AMDAPPSDK-3.0/include:" -RUN ls /opt/AMDAPPSDK-3.0/include - - - - - - - - - - -RUN echo "sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libOpenCL.so.1 /usr/lib/libOpenCL.so.1" RUN sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libOpenCL.so.1 /usr/lib/libOpenCL.so.1 -RUN echo "sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libamdocl64.so /usr/lib/libamdocl64.so" RUN sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libamdocl64.so /usr/lib/libamdocl64.so - - - - - - - RUN sudo apt install -y ocl-icd-opencl-dev vim +RUN echo "OpenCL Driver Installation Complete" + RUN echo "CLINFO:" RUN clinfo -#sudo ln -s /opt/intel/opencl/libOpenCL.so.1 /usr/lib/libOpenCL.so - ################################################################################ ######## Build Sibernetic diff --git a/run-quick.sh b/run-quick.sh index d7783fb..8d78b6f 100755 --- a/run-quick.sh +++ b/run-quick.sh @@ -14,7 +14,6 @@ done OW_OUT_DIR=/home/ow/shared HOST_OUT_DIR=$PWD - version=$(