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 1184ea48f..f5ae66281 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 \ @@ -65,5 +65,9 @@ ENV ROCAL_WORKSPACE=/workspace WORKDIR $ROCAL_WORKSPACE # install MIVisionX -RUN git clone https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git && \ +RUN git clone https://github.com/ROCm/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 ../ && 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 04ba31be4..a2e0343ba 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 \ @@ -61,5 +61,9 @@ ENV ROCAL_WORKSPACE=/workspace WORKDIR $ROCAL_WORKSPACE # install MIVisionX -RUN git clone https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git && \ +RUN git clone https://github.com/ROCm/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 ../ && 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 b73fe23c2..b7ad3616c 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 \ @@ -64,5 +64,9 @@ 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 +RUN git clone https://github.com/ROCm/MIVisionX && \ + 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 ../ && 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 90ad02ebe..69cb46adb 100644 --- a/docker/rocal-with-pytorch.dockerfile +++ b/docker/rocal-with-pytorch.dockerfile @@ -31,11 +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 && \ 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/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \ + 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 @@ -53,5 +52,9 @@ ENV ROCAL_WORKSPACE=/workspace WORKDIR $ROCAL_WORKSPACE # install MIVisionX -RUN git clone https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git && \ +RUN git clone https://github.com/ROCm/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 ../ && 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 857e92ad9..6244aea81 100644 --- a/rocAL-setup.py +++ b/rocAL-setup.py @@ -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")