diff --git a/docker/rocal-on-ubuntu-20-with-pytorch-with-mesa.dockerfile b/docker/rocal-on-ubuntu-20-with-pytorch-with-mesa.dockerfile index 0ca865469..a8d3ab5ef 100644 --- a/docker/rocal-on-ubuntu-20-with-pytorch-with-mesa.dockerfile +++ b/docker/rocal-on-ubuntu-20-with-pytorch-with-mesa.dockerfile @@ -1,8 +1,8 @@ ARG PYTORCH_VERSION=latest FROM rocm/pytorch:${PYTORCH_VERSION} -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.4/ubuntu/focal/amdgpu-install_5.4.50400-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.4.50400-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.0.2/ubuntu/focal/amdgpu-install_6.0.60002-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.0.60002-1_all.deb ENV ROCAL_DEPS_ROOT=/rocAL-deps WORKDIR $ROCAL_DEPS_ROOT @@ -20,7 +20,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-de wget ${ROCM_INSTALLER_REPO} && \ sudo apt-get install -y ./${ROCM_INSTALLER_PACKAGE} && \ sudo apt-get update -y && \ - sudo amdgpu-install -y --usecase=graphics,rocm + sudo amdgpu-install -y --usecase=graphics,rocm --no-32 # install OpenCV RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy \ @@ -47,7 +47,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev git clone -b 2.0.6.2 https://github.com/rrawther/libjpeg-turbo.git && cd libjpeg-turbo && mkdir build && cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libjpeg-turbo-2.0.3 \ -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib ../ && make -j4 && sudo make install && cd ../../ && \ - git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \ + git clone https://github.com/ROCm/rpp && cd rpp && mkdir build && cd build && \ cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \ git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \ ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd @@ -58,12 +58,18 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 python3-pip git g+ cmake ../ && make -j4 && sudo make install && cd ../../ && \ pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \ cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \ + pip install numpy==1.24.2 scipy==1.9.3 cython==0.29.* git+https://github.com/ROCmSoftwarePlatform/hipify_torch.git && \ + env CC=$MPI_HOME/bin/mpicc python -m pip install mpi4py && \ git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \ - pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 + pip install -e . --no-cache-dir -vvvv + +# install MIVisionX +RUN git clone https://github.com/ROCm/MIVisionX.git && cd MIVisionX && \ + mkdir build && cd build && cmake -DBACKEND=HIP -DROCAL=OFF ../ && make -j8 && make install ENV ROCAL_WORKSPACE=/workspace WORKDIR $ROCAL_WORKSPACE -# install MIVisionX -RUN git clone https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git && \ - mkdir build && cd build && cmake -DBACKEND=HIP -DROCAL=OFF ../MIVisionX && make -j8 && make install +# Install rocAL +RUN git clone -b develop https://github.com/ROCm/rocAL && \ + mkdir build && cd build && cmake ../rocAL && make -j8 && cmake --build . --target PyPackageInstall && make install \ No newline at end of file diff --git a/docker/rocal-on-ubuntu-20.dockerfile b/docker/rocal-on-ubuntu-20.dockerfile index c72add09a..24a25ed47 100644 --- a/docker/rocal-on-ubuntu-20.dockerfile +++ b/docker/rocal-on-ubuntu-20.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.4.1/ubuntu/focal/amdgpu-install_5.4.50401-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.4.50401-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.0.2/ubuntu/focal/amdgpu-install_6.0.60002-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.0.60002-1_all.deb ENV ROCAL_DEPS_ROOT=/rocAL-deps WORKDIR $ROCAL_DEPS_ROOT @@ -17,7 +17,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-de wget ${ROCM_INSTALLER_REPO} && \ sudo apt-get install -y ./${ROCM_INSTALLER_PACKAGE} && \ sudo apt-get update -y && \ - sudo amdgpu-install -y --usecase=graphics,rocm + sudo amdgpu-install -y --usecase=graphics,rocm --no-32 # install OpenCV RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy \ @@ -41,10 +41,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install rocblas rocblas-dev miopen # install rocAL dependency RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev python-dev python3-dev libgflags-dev libgoogle-glog-dev liblmdb-dev nasm yasm libjsoncpp-dev clang && \ - git clone -b 2.0.6.2 https://github.com/rrawther/libjpeg-turbo.git && cd libjpeg-turbo && mkdir build && cd build && \ - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libjpeg-turbo-2.0.3 \ - -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib ../ && make -j4 && sudo make install && cd ../../ && \ - git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \ + git clone -b 3.0.1 https://github.com/libjpeg-turbo/libjpeg-turbo.git && cd libjpeg-turbo && mkdir build && cd build && \ + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib -DWITH_JPEG8=TRUE ../ && \ + git clone https://github.com/ROCm/rpp && cd rpp && mkdir build && cd build && \ cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \ git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \ ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd @@ -55,12 +54,18 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 python3-pip git g+ cmake ../ && make -j4 && sudo make install && cd ../../ && \ pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \ cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \ - git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \ - pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 + pip install numpy==1.24.2 scipy==1.9.3 cython==0.29.* git+https://github.com/ROCmSoftwarePlatform/hipify_torch.git && \ + env CC=$MPI_HOME/bin/mpicc python -m pip install mpi4py && \ + git clone -b rocm6.1_internal_testing https://github.com/ROCm/cupy.git && cd cupy && git submodule update --init && \ + pip install -e . --no-cache-dir -vvvv + +# install MIVisionX +RUN git clone https://github.com/ROCm/MIVisionX.git && cd MIVisionX && \ + mkdir build && cd build && cmake -DBACKEND=HIP -DROCAL=OFF ../ && make -j8 && make install ENV ROCAL_WORKSPACE=/workspace WORKDIR $ROCAL_WORKSPACE -# install MIVisionX -RUN git clone https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git && \ - mkdir build && cd build && cmake -DBACKEND=HIP -DROCAL=OFF ../MIVisionX && make -j8 && make install +# Install rocAL +RUN git clone -b develop https://github.com/ROCm/rocAL && \ + mkdir build && cd build && cmake ../rocAL && make -j8 && cmake --build . --target PyPackageInstall && make install \ No newline at end of file diff --git a/docker/rocal-on-ubuntu-22.dockerfile b/docker/rocal-on-ubuntu-22.dockerfile index b813a21db..a28403457 100644 --- a/docker/rocal-on-ubuntu-22.dockerfile +++ b/docker/rocal-on-ubuntu-22.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.4.1/ubuntu/jammy/amdgpu-install_5.4.50401-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.4.50401-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.0.2/ubuntu/jammy/amdgpu-install_6.0.60002-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.0.60002-1_all.deb ENV ROCAL_DEPS_ROOT=/rocAL-deps WORKDIR $ROCAL_DEPS_ROOT @@ -17,7 +17,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-de wget ${ROCM_INSTALLER_REPO} && \ sudo apt-get install -y ./${ROCM_INSTALLER_PACKAGE} && \ sudo apt-get update -y && \ - sudo amdgpu-install -y --usecase=graphics,rocm + sudo amdgpu-install -y --usecase=graphics,rocm --no-32 # install OpenCV RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python3-dev python3-numpy \ @@ -42,13 +42,13 @@ RUN apt-get -y install curl make g++ unzip libomp-dev libpthread-stubs0-dev wget RUN mkdir rocAL_deps && cd rocAL_deps && wget https://sourceforge.net/projects/half/files/half/1.12.0/half-1.12.0.zip && \ unzip half-1.12.0.zip -d half-files && sudo mkdir -p /usr/local/include/half && sudo cp half-files/include/half.hpp /usr/local/include/half && cd RUN apt-get update -y && apt-get -y install autoconf automake libbz2-dev libssl-dev python3-dev libgflags-dev libgoogle-glog-dev liblmdb-dev nasm yasm libjsoncpp-dev && \ - git clone -b 2.0.6.2 https://github.com/rrawther/libjpeg-turbo.git && cd libjpeg-turbo && mkdir build && cd build && \ - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libjpeg-turbo-2.0.3 \ - -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib ../ && make -j4 && sudo make install && cd + git clone -b 3.0.1 https://github.com/libjpeg-turbo/libjpeg-turbo.git && cd libjpeg-turbo && mkdir build && cd build && \ + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib -DWITH_JPEG8=TRUE ../ && \ + make -j4 && sudo make install && cd RUN apt-get -y install sqlite3 libsqlite3-dev libtool build-essential RUN git clone -b v3.21.9 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \ ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd -RUN git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \ +RUN git clone https://github.com/ROCm/rpp && cd rpp && mkdir build && cd build && \ cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ENV CUPY_INSTALL_USE_HIP=1 ENV ROCM_HOME=/opt/rocm @@ -57,12 +57,18 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 python3-pip git g+ cmake ../ && make -j4 && sudo make install && cd ../../ && \ pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \ cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \ - git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \ - pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 + pip install numpy==1.24.2 scipy==1.9.3 cython==0.29.* git+https://github.com/ROCmSoftwarePlatform/hipify_torch.git && \ + env CC=$MPI_HOME/bin/mpicc python -m pip install mpi4py && \ + git clone -b rocm6.1_internal_testing https://github.com/ROCm/cupy.git && cd cupy && git submodule update --init && \ + pip install -e . --no-cache-dir -vvvv + +# Install MIVisionX +RUN git clone https://github.com/ROCm/MIVisionX && cd MIVisionX && \ + mkdir build && cd build && cmake -DBACKEND=HIP -DROCAL=OFF ../ && make -j8 && make install ENV ROCAL_WORKSPACE=/workspace WORKDIR $ROCAL_WORKSPACE -# Install MIVisionX -RUN git clone https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git && \ - mkdir build && cd build && cmake -DBACKEND=HIP -DROCAL=OFF ../MIVisionX && make -j8 && make install \ No newline at end of file +# Install rocAL +RUN git clone -b develop https://github.com/ROCm/rocAL && \ + mkdir build && cd build && cmake ../rocAL && make -j8 && cmake --build . --target PyPackageInstall && make install \ No newline at end of file diff --git a/docker/rocal-with-pytorch.dockerfile b/docker/rocal-with-pytorch.dockerfile index a26a845c0..f955e9146 100644 --- a/docker/rocal-with-pytorch.dockerfile +++ b/docker/rocal-with-pytorch.dockerfile @@ -31,10 +31,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install rocblas rocblas-dev miopen # install rocAL dependency RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev python-dev python3-dev libgflags-dev libgoogle-glog-dev liblmdb-dev nasm yasm libjsoncpp-dev clang && \ - git clone -b 2.0.6.2 https://github.com/rrawther/libjpeg-turbo.git && cd libjpeg-turbo && mkdir build && cd build && \ - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libjpeg-turbo-2.0.3 \ - -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib ../ && make -j4 && sudo make install && cd ../../ && \ - git clone -b 1.1.0 https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \ + git clone -b 3.0.1 https://github.com/libjpeg-turbo/libjpeg-turbo.git && cd libjpeg-turbo && mkdir build && cd build && \ + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib -DWITH_JPEG8=TRUE ../ && \ + make -j4 && sudo make install && cd && \ + git clone https://github.com/ROCm/rpp.git && cd rpp && mkdir build && cd build && \ cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \ git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \ ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd @@ -45,12 +45,18 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3 python3-pip git g+ cmake ../ && make -j4 && sudo make install && cd ../../ && \ pip install pytest==3.1 && git clone -b v2.10.4 https://github.com/pybind/pybind11 && cd pybind11 && mkdir build && cd build && \ cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../ && make -j4 && sudo make install && cd ../../ && \ - git clone https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \ - pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 + pip install numpy==1.24.2 scipy==1.9.3 cython==0.29.* git+https://github.com/ROCmSoftwarePlatform/hipify_torch.git && \ + env CC=$MPI_HOME/bin/mpicc python -m pip install mpi4py && \ + git clone -b rocm6.1_internal_testing https://github.com/ROCm/cupy.git && cd cupy && git submodule update --init && \ + pip install -e . --no-cache-dir -vvvv + +# install MIVisionX +RUN git clone https://github.com/ROCm/MIVisionX.git && cd MIVisionX && \ + mkdir build && cd build && cmake -DBACKEND=HIP -DROCAL=OFF ../ && make -j8 && make install && cd ENV ROCAL_WORKSPACE=/workspace WORKDIR $ROCAL_WORKSPACE -# install MIVisionX -RUN git clone https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git && \ - mkdir build && cd build && cmake -DBACKEND=HIP -DROCAL=OFF ../MIVisionX && make -j8 && make install +# Install rocAL +RUN git clone -b develop https://github.com/ROCm/rocAL && \ + mkdir build && cd build && cmake -DPYTHONVERSION=3.9 ../rocAL && make -j8 && cmake --build . --target PyPackageInstall && make install \ No newline at end of file diff --git a/rocAL-setup.py b/rocAL-setup.py index 1032aef6c..30f0e29d2 100644 --- a/rocAL-setup.py +++ b/rocAL-setup.py @@ -318,7 +318,7 @@ ' -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib -DWITH_JPEG8=TRUE ..; make -j 4; sudo make install )') # RPP os.system('sudo -v') - os.system('(cd '+deps_dir+'; git clone -b '+rppVersion+' https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git; cd rpp; mkdir build-'+backend+'; cd build-'+backend+'; ' + + os.system('(cd '+deps_dir+'; git clone -b '+rppVersion+' https://github.com/ROCm/rpp; cd rpp; mkdir build-'+backend+'; cd build-'+backend+'; ' + linuxCMake+' -DBACKEND='+backend+' -DCMAKE_INSTALL_PREFIX='+ROCM_PATH+' ../; make -j4; sudo make install)') # RapidJSON os.system('sudo -v') @@ -345,8 +345,8 @@ os.system('sudo '+linuxFlag+' '+linuxSystemInstall + ' '+linuxSystemInstall_check+' install -y git g++ hipblas hipsparse rocrand hipfft rocfft rocthrust-devel hipcub-devel python3-devel') os.system('sudo -v') - os.system('(cd '+deps_dir+'; git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git; export CUPY_INSTALL_USE_HIP=1; export ROCM_HOME=/opt/rocm; cd cupy; git submodule update --init; pip install -e . --no-cache-dir -vvvv)') - os.system('pip install numpy==1.21') + os.system('pip install numpy==1.24.2 scipy==1.9.3 cython==0.29.*') + os.system('(cd '+deps_dir+'; git clone -b rocm6.1_internal_testing https://github.com/ROCm/cupy.git; export CUPY_INSTALL_USE_HIP=1; export ROCM_HOME=/opt/rocm; cd cupy; git submodule update --init; pip install -e . --no-cache-dir -vvvv)') # Install ffmpeg if "Ubuntu" in platfromInfo: @@ -419,7 +419,7 @@ # MIVisionX os.system('sudo -v') - os.system('(cd '+deps_dir+'; git clone -b '+mivisionxVersion+' https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git; cd MIVisionX; mkdir build-'+backend+'; cd build-'+backend+'; ' + + os.system('(cd '+deps_dir+'; git clone -b '+mivisionxVersion+' https://github.com/ROCm/MIVisionX.git; cd MIVisionX; mkdir build-'+backend+'; cd build-'+backend+'; ' + linuxCMake+' -DBACKEND='+backend+' -DROCAL=OFF ../; make -j4; sudo make install)') print("\nrocAL Dependencies Installed with rocAL-setup.py V-"+__version__+"\n")