diff --git a/CHANGELOG.md b/CHANGELOG.md index 65707cf2f8..f1b454105e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ Documentation for MIVisionX is available at * OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0) * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2) * Dependencies for all the above packages -* MIVisionX Setup Script - `V3.1.0` +* MIVisionX Setup Script - `V3.2.0` ### Known issues diff --git a/CMakeLists.txt b/CMakeLists.txt index 6708dd88b0..50a410bd12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,6 @@ option(NEURAL_NET "Build MIVisionX with Neural Net Support" ON) option(LOOM "Build MIVisionX with LOOM Support" ON) option(GPU_SUPPORT "Build MIVisionX with GPU Support" ON) option(MIGRAPHX "Build MIVisionX with MIGraphX Support" ON) -option(BUILD_WITH_AMD_ADVANCE "Build MIVisionX for advanced AMD GPU Architecture" OFF) if(WIN32) set(BACKEND "OpenCL") @@ -136,9 +135,6 @@ endif() if(HIP_FOUND) message("-- ${BoldBlue}ROCm Version -- ${HIP_VERSION}${ColourReset}") set(LOOM OFF) - if(HIP_VERSION VERSION_GREATER 5.7.50701) - set(BUILD_WITH_AMD_ADVANCE ON) - endif() endif() message("-- ${Cyan}MIVisionX Developer Options${ColourReset}") @@ -147,7 +143,6 @@ message("-- ${Cyan} -D LOOM=${LOOM} [Turn ON/OFF LOOM OpenCL Modules (defaul message("-- ${Cyan} -D GPU_SUPPORT=${GPU_SUPPORT} [Turn ON/OFF GPU support (default:ON)]${ColourReset}") message("-- ${Cyan} -D MIGRAPHX=${MIGRAPHX} [Turn ON/OFF MIGraphX Module (default:ON)]${ColourReset}") message("-- ${Cyan} -D BACKEND=${BACKEND} [Select MIVisionX Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}") -message("-- ${Cyan} -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:OFF)]${ColourReset}") add_subdirectory(amd_openvx) add_subdirectory(amd_openvx_extensions) @@ -204,6 +199,16 @@ set(MIVISIONX_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev, rpp-dev, rocblas-d # TBD - Some RPM packages need Fusion Packages - ffmpeg, libavcodec-devel, libavformat-devel, libavutil-devel, libswscale-devel set(MIVISIONX_RPM_DEV_PACKAGE_LIST "rocm-hip-runtime-devel, rpp-devel, rocblas-devel, miopen-hip-devel, migraphx-devel") +# Add rocDecode Deps - Exclude centos-7 +file(READ "/etc/os-release" OS_RELEASE) +string(REGEX MATCH "CentOS-7" CENTOS_7_FOUND ${OS_RELEASE}) +if(NOT CENTOS_7_FOUND) + set(MIVISIONX_DEBIAN_PACKAGE_LIST "${MIVISIONX_DEBIAN_PACKAGE_LIST}, rocdecode") + set(MIVISIONX_RPM_PACKAGE_LIST "${MIVISIONX_RPM_PACKAGE_LIST}, rocdecode") + set(MIVISIONX_DEBIAN_DEV_PACKAGE_LIST "${MIVISIONX_DEBIAN_DEV_PACKAGE_LIST}, rocdecode-dev") + set(MIVISIONX_RPM_DEV_PACKAGE_LIST "${MIVISIONX_RPM_DEV_PACKAGE_LIST}, rocdecode-devel") +endif() + # '%{?dist}' breaks manual builds on debian systems due to empty Provides execute_process( COMMAND rpm --eval %{?dist} diff --git a/MIVisionX-setup.py b/MIVisionX-setup.py index 78af588130..7d8e3041d0 100644 --- a/MIVisionX-setup.py +++ b/MIVisionX-setup.py @@ -30,7 +30,7 @@ __copyright__ = "Copyright 2018 - 2024, AMD ROCm MIVisionX" __license__ = "MIT" -__version__ = "3.1.0" +__version__ = "3.2.0" __email__ = "mivisionx.support@amd.com" __status__ = "Shipping" @@ -279,6 +279,16 @@ def ERROR_CHECK(call): 'rpp-devel' ] +rocdecodeDebianPackages = [ + 'rocdecode', + 'rocdecode-dev' +] + +rocdecodeRPMPackages = [ + 'rocdecode', + 'rocdecode-devel' +] + opencvDebianPackages = [ 'build-essential', 'pkg-config', @@ -333,6 +343,16 @@ def ERROR_CHECK(call): for i in range(len(rppRPMPackages)): ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall + ' '+linuxSystemInstall_check+' install -y '+ rppRPMPackages[i])) + + # rocDecode + if "Ubuntu" in platfromInfo: + for i in range(len(rocdecodeDebianPackages)): + ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall + + ' '+linuxSystemInstall_check+' install -y '+ rocdecodeDebianPackages[i])) + else: + for i in range(len(rocdecodeRPMPackages)): + ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall + + ' '+linuxSystemInstall_check+' install -y '+ rocdecodeRPMPackages[i])) print("\nMIVisionX Dependencies Re-Installed with MIVisionX-setup.py V-"+__version__+"\n") exit() @@ -412,6 +432,16 @@ def ERROR_CHECK(call): ' '+linuxSystemInstall_check+' install -y '+ rppRPMPackages[i])) else: print("\nSTATUS: MIVisionX Setup: AMD VX RPP only supported with HIP backend\n") + + # rocDecode + if "Ubuntu" in platfromInfo: + for i in range(len(rocdecodeDebianPackages)): + ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall + + ' '+linuxSystemInstall_check+' install -y '+ rocdecodeDebianPackages[i])) + else: + for i in range(len(rocdecodeRPMPackages)): + ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall + + ' '+linuxSystemInstall_check+' install -y '+ rocdecodeRPMPackages[i])) # Install ffmpeg if ffmpegInstall == 'ON': diff --git a/README.md b/README.md index 2deea68a3b..261f312671 100644 --- a/README.md +++ b/README.md @@ -309,7 +309,7 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release * OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0) * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2) * Dependencies for all the above packages -* MIVisionX Setup Script - `V3.1.0` +* MIVisionX Setup Script - `V3.2.0` ### Known issues diff --git a/amd_openvx/CMakeLists.txt b/amd_openvx/CMakeLists.txt index d96f415220..12a0c303c7 100644 --- a/amd_openvx/CMakeLists.txt +++ b/amd_openvx/CMakeLists.txt @@ -30,10 +30,7 @@ if(GPU_SUPPORT AND "${BACKEND}" STREQUAL "HIP") endif() endif() list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH} ${ROCM_PATH}/hip) - set(DEFAULT_AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908;gfx90a;gfx940;gfx1030;gfx1031;gfx1032;gfx1100") - if (BUILD_WITH_AMD_ADVANCE) - set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx941;gfx942") - endif() + set(DEFAULT_AMDGPU_TARGETS "gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102") set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target") find_package(HIP QUIET) if(HIP_FOUND) diff --git a/amd_openvx_extensions/amd_nn/CMakeLists.txt b/amd_openvx_extensions/amd_nn/CMakeLists.txt index ed98357ccf..366dc3dcf7 100644 --- a/amd_openvx_extensions/amd_nn/CMakeLists.txt +++ b/amd_openvx_extensions/amd_nn/CMakeLists.txt @@ -34,10 +34,7 @@ if(GPU_SUPPORT AND "${BACKEND}" STREQUAL "OPENCL") elseif(GPU_SUPPORT AND "${BACKEND}" STREQUAL "HIP") set(OpenCL_FOUND FALSE) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH} ${ROCM_PATH}/hip) - set(DEFAULT_AMDGPU_TARGETS "gfx803;gfx900;gfx906;gfx908;gfx90a;gfx940;gfx1030;gfx1031;gfx1032;gfx1100") - if (BUILD_WITH_AMD_ADVANCE) - set(DEFAULT_AMDGPU_TARGETS ${DEFAULT_AMDGPU_TARGETS} "gfx941;gfx942") - endif() + set(DEFAULT_AMDGPU_TARGETS "gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1031;gfx1032;gfx1100;gfx1101;gfx1102") set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target") find_package(HIP REQUIRED) find_package(rocblas PATHS ${ROCM_PATH} REQUIRED) diff --git a/docker/README.md b/docker/README.md index 886938f055..80bf81aa92 100644 --- a/docker/README.md +++ b/docker/README.md @@ -7,7 +7,7 @@ Docker is a set of platform as a service (PaaS) products that use OS-level virtu #### Prerequisites * Ubuntu `20.04`/`22.04` * [ROCm supported hardware](https://rocm.docs.amd.com/en/latest/release/gpu_os_support.html) -* Install [ROCm](https://rocmdocs.amd.com/en/latest/deploy/linux/installer/install.html) with `--usecase=graphics,rocm` +* Install [ROCm](https://rocmdocs.amd.com/en/latest/deploy/linux/installer/install.html) with `--usecase=rocm` * [Docker](https://docs.docker.com/engine/install/ubuntu/) #### Workflow diff --git a/docker/conformance/openvx-1-3-on-centos7.dockerfile b/docker/conformance/openvx-1-3-on-centos7.dockerfile deleted file mode 100644 index 692ac12bee..0000000000 --- a/docker/conformance/openvx-1-3-on-centos7.dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -FROM centos:centos7 - -ENV MIVISIONX_DEPS_ROOT=/opt/mivisionx-deps -WORKDIR $MIVISIONX_DEPS_ROOT - -# install mivisionx base dependencies -RUN yum -y update --nogpgcheck && yum -y install --nogpgcheck http://repo.okay.com.mx/centos/7/x86_64/release/okay-release-1-1.noarch.rpm && \ - yum -y install --nogpgcheck gcc gcc-c++ kernel-devel make cmake3 git && yum-config-manager --enable rhel-server-rhscl-7-rpms && \ - yum -y install --nogpgcheck centos-release-scl && yum -y install --nogpgcheck devtoolset-7 -# Enable Developer Toolset 7 -SHELL [ "/usr/bin/scl", "enable", "devtoolset-7" ] -# install ROCm for mivisionx OpenCL & HIP -RUN echo -e "[ROCm]\nname=ROCm\nbaseurl=https://repo.radeon.com/rocm/yum/rpm\nenabled=1\ngpgcheck=1\ngpgkey=https://repo.radeon.com/rocm/rocm.gpg.key" > \ - /etc/yum.repos.d/rocm.repo && yum -y install --nogpgcheck rocm-dev - -WORKDIR /workspace - -ENV OPENVX_INC=/workspace/MIVisionX/amd_openvx/openvx -ENV OPENVX_DIR_OPENCL=/workspace/build-opencl -ENV OPENVX_DIR_HIP=/workspace/build-hip -ENV VX_TEST_DATA_PATH=/workspace/conformance_tests/OpenVX-cts/test_data/ - -# install MIVisionX OpenCL -RUN git clone https://github.com/ROCm/MIVisionX.git && \ - python MIVisionX/docker/conformance/system_info.py && \ - mkdir build-opencl && cd build-opencl && cmake3 ../MIVisionX && make -j8 -RUN mkdir conformance_tests && cd conformance_tests && git clone -b openvx_1.3 https://github.com/KhronosGroup/OpenVX-cts.git && \ - mkdir build-cts-opencl && cd build-cts-opencl && \ - cmake3 -DOPENVX_INCLUDES=$OPENVX_INC/include -DOPENVX_LIBRARIES=$OPENVX_DIR_OPENCL/lib/libopenvx.so\;$OPENVX_DIR_OPENCL/lib/libvxu.so\;pthread\;dl\;m\;rt -DOPENVX_CONFORMANCE_VISION=ON ../OpenVX-cts && \ - cmake3 --build . -RUN cd conformance_tests/build-cts-opencl && AGO_DEFAULT_TARGET=CPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-CPU-CTS-OCL-centos7.md && \ - AGO_DEFAULT_TARGET=GPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-GPU-CTS-OCL-centos7.md && \ - mv *.md /workspace/ -# install MIVisionX HIP -RUN mkdir build-hip && cd build-hip && cmake3 ../MIVisionX -DBACKEND=HIP && make -j8 -RUN cd conformance_tests && mkdir build-cts-hip && cd build-cts-hip && \ - cmake3 -DOPENVX_INCLUDES=$OPENVX_INC/include -DOPENVX_LIBRARIES=$OPENVX_DIR_HIP/lib/libopenvx.so\;$OPENVX_DIR_HIP/lib/libvxu.so\;/opt/rocm/hip/lib/libamdhip64.so\;pthread\;dl\;m\;rt -DOPENVX_CONFORMANCE_VISION=ON ../OpenVX-cts && \ - cmake3 --build . -RUN cd conformance_tests/build-cts-hip && AGO_DEFAULT_TARGET=CPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-CPU-CTS-HIP-centos7.md && \ - AGO_DEFAULT_TARGET=GPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-GPU-CTS-HIP-centos7.md && \ - mv *.md /workspace/ \ No newline at end of file diff --git a/docker/conformance/openvx-1-3-on-centos8.dockerfile b/docker/conformance/openvx-1-3-on-centos8.dockerfile deleted file mode 100644 index 5d0f43ae09..0000000000 --- a/docker/conformance/openvx-1-3-on-centos8.dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM centos:centos8 - -ENV MIVISIONX_DEPS_ROOT=/opt/mivisionx-deps -WORKDIR $MIVISIONX_DEPS_ROOT - -# install mivisionx base dependencies -RUN yum -y update --nogpgcheck && yum -y install --nogpgcheck gcc gcc-c++ kernel-devel make cmake git -# install ROCm for mivisionx OpenC & HIP -RUN echo -e "[ROCm]\nname=ROCm\nbaseurl=https://repo.radeon.com/rocm/centos8/rpm/\nenabled=1\ngpgcheck=1\ngpgkey=https://repo.radeon.com/rocm/rocm.gpg.key" > \ - /etc/yum.repos.d/rocm.repo && yum -y update --nogpgcheck && yum -y install --nogpgcheck rocm-dev - -WORKDIR /workspace - -ENV OPENVX_INC=/workspace/MIVisionX/amd_openvx/openvx -ENV OPENVX_DIR_OPENCL=/workspace/build-opencl -ENV OPENVX_DIR_HIP=/workspace/build-hip -ENV VX_TEST_DATA_PATH=/workspace/conformance_tests/OpenVX-cts/test_data/ - -# install MIVisionX OpenCL -RUN git clone https://github.com/ROCm/MIVisionX.git && \ - python MIVisionX/docker/conformance/system_info.py && \ - mkdir build-opencl && cd build-opencl && cmake ../MIVisionX && make -j8 -RUN mkdir conformance_tests && cd conformance_tests && git clone -b openvx_1.3 https://github.com/KhronosGroup/OpenVX-cts.git && \ - mkdir build-cts-opencl && cd build-cts-opencl && \ - cmake -DOPENVX_INCLUDES=$OPENVX_INC/include -DOPENVX_LIBRARIES=$OPENVX_DIR_OPENCL/lib/libopenvx.so\;$OPENVX_DIR_OPENCL/lib/libvxu.so\;pthread\;dl\;m\;rt -DOPENVX_CONFORMANCE_VISION=ON ../OpenVX-cts && \ - cmake --build . -RUN cd conformance_tests/build-cts-opencl && AGO_DEFAULT_TARGET=CPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-CPU-CTS-OCL-centos7.md && \ - AGO_DEFAULT_TARGET=GPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-GPU-CTS-OCL-centos7.md && \ - mv *.md /workspace/ -# install MIVisionX HIP -RUN mkdir build-hip && cd build-hip && cmake ../MIVisionX -DBACKEND=HIP && make -j8 -RUN cd conformance_tests && mkdir build-cts-hip && cd build-cts-hip && \ - cmake -DOPENVX_INCLUDES=$OPENVX_INC/include -DOPENVX_LIBRARIES=$OPENVX_DIR_HIP/lib/libopenvx.so\;$OPENVX_DIR_HIP/lib/libvxu.so\;/opt/rocm/hip/lib/libamdhip64.so\;pthread\;dl\;m\;rt -DOPENVX_CONFORMANCE_VISION=ON ../OpenVX-cts && \ - cmake --build . -RUN cd conformance_tests/build-cts-hip && AGO_DEFAULT_TARGET=CPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-CPU-CTS-HIP-centos7.md && \ - AGO_DEFAULT_TARGET=GPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-GPU-CTS-HIP-centos7.md && \ - mv *.md /workspace/ \ No newline at end of file diff --git a/docker/conformance/openvx-1-3-on-ubuntu18.dockerfile b/docker/conformance/openvx-1-3-on-ubuntu18.dockerfile deleted file mode 100644 index bdbbe0ec0e..0000000000 --- a/docker/conformance/openvx-1-3-on-ubuntu18.dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -FROM ubuntu:18.04 - -ENV MIVISIONX_DEPS_ROOT=/opt/mivisionx-deps -WORKDIR $MIVISIONX_DEPS_ROOT - -RUN apt-get update -y -# install mivisionx base dependencies -RUN apt-get -y install gcc g++ cmake git - -# install ROCm for mivisionx OpenCL/HIP dependency -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-dev wget sudo keyboard-configuration && \ - wget https://repo.radeon.com/amdgpu-install/22.20/ubuntu/bionic/amdgpu-install_22.20.50200-1_all.deb && \ - sudo apt-get -y install ./amdgpu-install_22.20.50200-1_all.deb && \ - sudo apt-get update -y && \ - sudo amdgpu-install -y --usecase=graphics,rocm - -WORKDIR /workspace - -ENV OPENVX_INC=/workspace/MIVisionX/amd_openvx/openvx -ENV OPENVX_DIR_OPENCL=/workspace/build-opencl -ENV OPENVX_DIR_HIP=/workspace/build-hip -ENV VX_TEST_DATA_PATH=/workspace/conformance_tests/OpenVX-cts/test_data/ - -# install MIVisionX OpenCL -RUN git clone https://github.com/ROCm/MIVisionX.git && \ - python MIVisionX/docker/conformance/system_info.py && \ - mkdir build-opencl && cd build-opencl && cmake ../MIVisionX && make -j8 -RUN mkdir conformance_tests && cd conformance_tests && git clone -b openvx_1.3 https://github.com/KhronosGroup/OpenVX-cts.git && \ - mkdir build-cts-opencl && cd build-cts-opencl && \ - cmake -DOPENVX_INCLUDES=$OPENVX_INC/include -DOPENVX_LIBRARIES=$OPENVX_DIR_OPENCL/lib/libopenvx.so\;$OPENVX_DIR_OPENCL/lib/libvxu.so\;pthread\;dl\;m\;rt -DOPENVX_CONFORMANCE_VISION=ON ../OpenVX-cts && \ - cmake --build . -RUN cd conformance_tests/build-cts-opencl && AGO_DEFAULT_TARGET=CPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-CPU-CTS-OCL-centos7.md && \ - AGO_DEFAULT_TARGET=GPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-GPU-CTS-OCL-centos7.md && \ - mv *.md /workspace/ -# install MIVisionX HIP -RUN mkdir build-hip && cd build-hip && cmake ../MIVisionX -DBACKEND=HIP && make -j8 -RUN cd conformance_tests && mkdir build-cts-hip && cd build-cts-hip && \ - cmake -DOPENVX_INCLUDES=$OPENVX_INC/include -DOPENVX_LIBRARIES=$OPENVX_DIR_HIP/lib/libopenvx.so\;$OPENVX_DIR_HIP/lib/libvxu.so\;/opt/rocm/hip/lib/libamdhip64.so\;pthread\;dl\;m\;rt -DOPENVX_CONFORMANCE_VISION=ON ../OpenVX-cts && \ - cmake --build . -RUN cd conformance_tests/build-cts-hip && AGO_DEFAULT_TARGET=CPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-CPU-CTS-HIP-centos7.md && \ - AGO_DEFAULT_TARGET=GPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance | tee OpenVX-GPU-CTS-HIP-centos7.md && \ - mv *.md /workspace/ diff --git a/docker/conformance/openvx-1-3-on-ubuntu20.dockerfile b/docker/conformance/openvx-1-3-on-ubuntu20.dockerfile index b6ae9a6496..c1b0d9e891 100644 --- a/docker/conformance/openvx-1-3-on-ubuntu20.dockerfile +++ b/docker/conformance/openvx-1-3-on-ubuntu20.dockerfile @@ -8,10 +8,10 @@ RUN apt-get update -y RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gcc g++ cmake pkg-config git # install ROCm for mivisionx OpenCL/HIP dependency RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-dev wget sudo keyboard-configuration && \ - wget https://repo.radeon.com/amdgpu-install/22.20/ubuntu/focal/amdgpu-install_22.20.50200-1_all.deb && \ - sudo apt-get install -y ./amdgpu-install_22.20.50200-1_all.deb && \ + wget https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/focal/amdgpu-install_6.1.60101-1_all.deb && \ + sudo apt-get install -y ./amdgpu-install_6.1.60101-1_all.deb && \ sudo apt-get update -y && \ - sudo amdgpu-install -y --usecase=graphics,rocm + sudo amdgpu-install -y --usecase=rocm WORKDIR /workspace diff --git a/docker/linux/mivisionx-on-rhel-8.dockerfile b/docker/linux/mivisionx-on-rhel-8.dockerfile deleted file mode 100644 index 0f89b9cd8b..0000000000 --- a/docker/linux/mivisionx-on-rhel-8.dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-rel-5.4:104-rhel-8.x-stg1 - -ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps -WORKDIR $MIVISIONX_DEPS_ROOT - -RUN sudo yum --nobest update -y - -# install base dependencies -RUN sudo yum -y install gcc gcc-c++ cmake pkg-config git kernel-devel - -# install OpenCV -RUN sudo yum -y install opencv opencv-devel - -# install neural net dependencies -RUN sudo yum -y install rocblas rocblas-devel miopen-hip miopen-hip-devel migraphx migraphx-devel - -# install rocAL dependencies -RUN sudo yum -y install make unzip libomp-devel wget clang -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 sudo yum -y install autoconf automake bzip2-devel openssl-devel python3-devel gflags-devel glog-devel lmdb-devel nasm yasm jsoncpp-devel && \ - 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 -RUN yum -y install sqlite-devel libtool && yum -y groupinstall 'Development Tools' -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.4.0 https://github.com/ROCm/rpp.git && cd rpp && mkdir build && cd build && \ - cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd - -ENV MIVISIONX_WORKSPACE=/workspace -WORKDIR $MIVISIONX_WORKSPACE - -# Install MIVisionX -RUN git clone https://github.com/ROCm/MIVisionX.git && \ - mkdir build && cd build && cmake -DBACKEND=HIP ../MIVisionX && make -j8 && make install \ No newline at end of file diff --git a/docker/linux/mivisionx-on-rhel-9.dockerfile b/docker/linux/mivisionx-on-rhel-9.dockerfile deleted file mode 100644 index 3d2d871ad1..0000000000 --- a/docker/linux/mivisionx-on-rhel-9.dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-rel-5.4:104-rhel-9.x-stg1 - -ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps -WORKDIR $MIVISIONX_DEPS_ROOT - -RUN sudo yum update -y - -# install base dependencies -RUN sudo yum -y install gcc g++ cmake pkg-config git kernel-devel - -# install OpenCV -RUN sudo yum -y install opencv opencv-devel - -# install neural net dependencies -RUN sudo yum -y install rocblas rocblas-devel miopen-hip miopen-hip-devel migraphx migraphx-devel - -# install rocAL dependencies -RUN yum -y install make g++ unzip libomp-devel wget clang -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 yum update -y && yum -y install autoconf automake bzip2-devel openssl-devel python3-devel gflags-devel glog-devel lmdb-devel nasm yasm jsoncpp-devel && \ - 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 -RUN yum -y install sqlite-devel libtool && yum -y groupinstall 'Development Tools' -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.4.0 https://github.com/ROCm/rpp.git && cd rpp && mkdir build && cd build && \ - cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd - -ENV MIVISIONX_WORKSPACE=/workspace -WORKDIR $MIVISIONX_WORKSPACE - -# Install MIVisionX -RUN git clone https://github.com/ROCm/MIVisionX.git && \ - mkdir build && cd build && cmake -DBACKEND=HIP ../MIVisionX && make -j8 && make install \ No newline at end of file diff --git a/docker/linux/mivisionx-on-sles-15.dockerfile b/docker/linux/mivisionx-on-sles-15.dockerfile deleted file mode 100644 index 8c7d61b021..0000000000 --- a/docker/linux/mivisionx-on-sles-15.dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-rel-5.4:104-sles-stg1 - -ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps -WORKDIR $MIVISIONX_DEPS_ROOT - -RUN sudo zypper update -y - -# install base dependencies -RUN sudo zypper -n install gcc gcc-c++ cmake pkg-config git kernel-devel - -# install rocAL dependencies -RUN sudo zypper -n install make unzip libomp-devel 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 zypper -n install autoconf automake bzip2 openssl-devel python3-devel gflags-devel glog-devel lmdb-devel nasm yasm jsoncpp-devel && \ - 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 -RUN zypper -n install sqlite-devel libtool && zypper -n install -t pattern devel_basis -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.4.0 https://github.com/ROCm/rpp.git && cd rpp && mkdir build && cd build && \ - cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd - -ENV MIVISIONX_WORKSPACE=/workspace -WORKDIR $MIVISIONX_WORKSPACE - -# Install MIVisionX -RUN git clone https://github.com/ROCm/MIVisionX.git && \ - mkdir build && cd build && cmake -DBACKEND=HIP ../MIVisionX && make -j8 && make install \ No newline at end of file diff --git a/docker/mivisionx-on-ubuntu20.dockerfile b/docker/mivisionx-on-ubuntu20.dockerfile index 0b7897a686..12382ac3fc 100644 --- a/docker/mivisionx-on-ubuntu20.dockerfile +++ b/docker/mivisionx-on-ubuntu20.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/focal/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/focal/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -15,7 +15,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=rocm # install OpenCV & FFMPEG - Level 3 ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy \ @@ -29,9 +29,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf automake build-es ./configure --enable-shared --disable-static --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libass --enable-gpl --enable-nonfree && \ make -j8 && sudo make install && cd # install MIVisionX neural net dependency - Level 4 -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install miopen-hip migraphx && \ - mkdir neuralNet && cd neuralNet && 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 DEBIAN_FRONTEND=noninteractive apt-get -y install half rocblas-dev miopen-hip-dev migraphx-dev rocdecode-dev # install MIVisionX AMD VX RPP dependency - Level 5 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 && \ diff --git a/docker/mivisionx-on-ubuntu22.dockerfile b/docker/mivisionx-on-ubuntu22.dockerfile index cc1ce8158c..5b14937841 100644 --- a/docker/mivisionx-on-ubuntu22.dockerfile +++ b/docker/mivisionx-on-ubuntu22.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/jammy/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/jammy/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -16,7 +16,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=rocm # install OpenCV & FFMPEG - Level 3 ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" @@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf automake build-es make -j8 && sudo make install && cd # install MIVisionX neural net dependency - Level 4 -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install rocblas rocblas-dev miopen-hip miopen-hip-dev migraphx +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install half rocblas-dev miopen-hip-dev migraphx-dev rocdecode-dev # install MIVisionX AMD VX RPP dependency - Level 5 ENV CUPY_INSTALL_USE_HIP=1 diff --git a/docker/mivisionx-release-ubuntu20.dockerfile b/docker/mivisionx-release-ubuntu20.dockerfile index b08db46171..ef05b48671 100644 --- a/docker/mivisionx-release-ubuntu20.dockerfile +++ b/docker/mivisionx-release-ubuntu20.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 -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 +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/focal/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -15,11 +15,11 @@ 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=rocm # install mivisionx package dependencies # VX_NN & VX_MIGraphX -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install half miopen-hip-dev rocblas-dev migraphx migraphx-dev +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install half rocblas-dev miopen-hip-dev migraphx-dev rocdecode-dev # VX_MEDIA RUN DEBIAN_FRONTEND=noninteractive apt-get -y install ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev # VX_openCV diff --git a/docker/mivisionx-release-ubuntu22.dockerfile b/docker/mivisionx-release-ubuntu22.dockerfile index 1a8e52d9c9..58767fb3fc 100644 --- a/docker/mivisionx-release-ubuntu22.dockerfile +++ b/docker/mivisionx-release-ubuntu22.dockerfile @@ -16,11 +16,11 @@ 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=rocm # install mivisionx package dependencies # VX_NN & VX_MIGraphX -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install half miopen-hip-dev rocblas-dev migraphx migraphx-dev +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install half rocblas-dev miopen-hip-dev migraphx-dev rocdecode-dev # VX_MEDIA RUN DEBIAN_FRONTEND=noninteractive apt-get -y install ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev # VX_openCV diff --git a/docker/ubuntu20/level-2.dockerfile b/docker/ubuntu20/level-2.dockerfile index f741a5e865..42f39c1123 100644 --- a/docker/ubuntu20/level-2.dockerfile +++ b/docker/ubuntu20/level-2.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/focal/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/focal/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -15,7 +15,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=rocm ENV MIVISIONX_WORKSPACE=/workspace WORKDIR $MIVISIONX_WORKSPACE diff --git a/docker/ubuntu20/level-3.dockerfile b/docker/ubuntu20/level-3.dockerfile index 8d30b98f23..af94a446ff 100644 --- a/docker/ubuntu20/level-3.dockerfile +++ b/docker/ubuntu20/level-3.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/focal/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/focal/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -15,7 +15,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=rocm # install OpenCV & FFMPEG - Level 3 ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy \ diff --git a/docker/ubuntu20/level-4.dockerfile b/docker/ubuntu20/level-4.dockerfile index ec1eb7de75..543b6ed8c8 100644 --- a/docker/ubuntu20/level-4.dockerfile +++ b/docker/ubuntu20/level-4.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/focal/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/focal/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -15,7 +15,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=rocm # install OpenCV & FFMPEG - Level 3 ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy \ @@ -29,9 +29,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf automake build-es ./configure --enable-shared --disable-static --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libass --enable-gpl --enable-nonfree && \ make -j8 && sudo make install && cd # install MIVisionX neural net dependency - Level 4 -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install miopen-hip migraphx && \ - mkdir neuralNet && cd neuralNet && 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 DEBIAN_FRONTEND=noninteractive apt-get -y install half rocblas-dev miopen-hip-dev migraphx-dev rocdecode-dev ENV MIVISIONX_WORKSPACE=/workspace WORKDIR $MIVISIONX_WORKSPACE diff --git a/docker/ubuntu20/level-5.dockerfile b/docker/ubuntu20/level-5.dockerfile index 634ab0b2a3..c7ec602bfd 100644 --- a/docker/ubuntu20/level-5.dockerfile +++ b/docker/ubuntu20/level-5.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/focal/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/focal/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -15,7 +15,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=rocm # install OpenCV & FFMPEG - Level 3 ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy \ @@ -29,15 +29,13 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf automake build-es ./configure --enable-shared --disable-static --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libass --enable-gpl --enable-nonfree && \ make -j8 && sudo make install && cd # install MIVisionX neural net dependency - Level 4 -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install miopen-hip migraphx && \ - mkdir neuralNet && cd neuralNet && 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 DEBIAN_FRONTEND=noninteractive apt-get -y install half rocblas-dev miopen-hip-dev migraphx-dev rocdecode-dev # install MIVisionX rocAL dependency - Level 5 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.4.0 https://github.com/ROCm/rpp.git && cd rpp && mkdir build && cd build && \ + git clone -b rocm-6.1.1 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 diff --git a/docker/ubuntu22/level-2.dockerfile b/docker/ubuntu22/level-2.dockerfile index de3c5b389d..da1247fe8b 100644 --- a/docker/ubuntu22/level-2.dockerfile +++ b/docker/ubuntu22/level-2.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/jammy/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/jammy/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -16,7 +16,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=rocm ENV MIVISIONX_WORKSPACE=/workspace WORKDIR $MIVISIONX_WORKSPACE diff --git a/docker/ubuntu22/level-3.dockerfile b/docker/ubuntu22/level-3.dockerfile index d8d994eb9c..c57eed305e 100644 --- a/docker/ubuntu22/level-3.dockerfile +++ b/docker/ubuntu22/level-3.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/jammy/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/jammy/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -16,7 +16,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=rocm # install OpenCV & FFMPEG - Level 3 ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" diff --git a/docker/ubuntu22/level-4.dockerfile b/docker/ubuntu22/level-4.dockerfile index 58b6618acc..6f24adc222 100644 --- a/docker/ubuntu22/level-4.dockerfile +++ b/docker/ubuntu22/level-4.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/jammy/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/jammy/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -16,7 +16,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=rocm # install OpenCV & FFMPEG - Level 3 ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" @@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf automake build-es make -j8 && sudo make install && cd # install MIVisionX neural net dependency - Level 4 -RUN apt-get -y install rocblas rocblas-dev miopen-hip miopen-hip-dev migraphx +RUN apt-get -y install half rocblas-dev miopen-hip-dev migraphx-dev rocdecode-dev ENV MIVISIONX_WORKSPACE=/workspace WORKDIR $MIVISIONX_WORKSPACE diff --git a/docker/ubuntu22/level-5.dockerfile b/docker/ubuntu22/level-5.dockerfile index 4f3b9f55f2..9ece614839 100644 --- a/docker/ubuntu22/level-5.dockerfile +++ b/docker/ubuntu22/level-5.dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 -ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/5.6.1/ubuntu/jammy/amdgpu-install_5.6.50601-1_all.deb -ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_5.6.50601-1_all.deb +ARG ROCM_INSTALLER_REPO=https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/jammy/amdgpu-install_6.1.60101-1_all.deb +ARG ROCM_INSTALLER_PACKAGE=amdgpu-install_6.1.60101-1_all.deb ENV MIVISIONX_DEPS_ROOT=/mivisionx-deps WORKDIR $MIVISIONX_DEPS_ROOT @@ -16,7 +16,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=rocm # install OpenCV & FFMPEG - Level 3 ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig/" @@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install autoconf automake build-es make -j8 && sudo make install && cd # install MIVisionX neural net dependency - Level 4 -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install rocblas rocblas-dev miopen-hip miopen-hip-dev migraphx +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install half rocblas-dev miopen-hip-dev migraphx-dev rocdecode-dev # install MIVisionX rocAL dependency - Level 5 ENV CUPY_INSTALL_USE_HIP=1 @@ -47,7 +47,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -y install autoc RUN DEBIAN_FRONTEND=noninteractive 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.4.0 https://github.com/ROCm/rpp.git && cd rpp && mkdir build && cd build && \ +RUN git clone -b rocm-6.1.1 https://github.com/ROCm/rpp.git && cd rpp && mkdir build && cd build && \ cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse rocrand hipfft rocfft rocthrust-dev hipcub-dev python3 python3-pip python3-dev && \ git clone https://github.com/Tencent/rapidjson.git && cd rapidjson && mkdir build && cd build && \ diff --git a/docker/zenDNN/zenDNN-gpu-hip.dockerfile b/docker/zenDNN/zenDNN-gpu-hip.dockerfile index 89e9b3d322..f19721031a 100644 --- a/docker/zenDNN/zenDNN-gpu-hip.dockerfile +++ b/docker/zenDNN/zenDNN-gpu-hip.dockerfile @@ -15,7 +15,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install initramfs-tools libnuma-de wget https://repo.radeon.com/amdgpu-install/22.20/ubuntu/focal/amdgpu-install_22.20.50200-1_all.deb && \ sudo apt-get install -y ./amdgpu-install_22.20.50200-1_all.deb && \ sudo apt-get update -y && \ - sudo amdgpu-install -y --usecase=graphics,rocm + sudo amdgpu-install -y --usecase=rocm # install OpenCV & FFMPEG - Level 3 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy \ libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev unzip && \ diff --git a/docs/how-to/mivisionx-docker.rst b/docs/how-to/mivisionx-docker.rst index 522883c15a..0bba3b65fa 100644 --- a/docs/how-to/mivisionx-docker.rst +++ b/docs/how-to/mivisionx-docker.rst @@ -18,7 +18,7 @@ Prerequisites * Ubuntu 20.04/22.04 * `ROCm supported hardware `_ -* `Install ROCm `_ with ``--usecase=graphics,rocm`` +* `Install ROCm `_ with ``--usecase=rocm`` * `Docker `_