CuPy - Version Updates (#1185)

CHANGELOG.md

@@ -47,7 +47,7 @@
 * RPP - [1.2.0](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/1.2.0)
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all the above packages
-* MIVisionX Setup Script - `V2.5.4`
+* MIVisionX Setup Script - `V2.5.5`
 
 ### Known issues
 

MIVisionX-setup.py

@@ -30,7 +30,7 @@
 __author__ = "Kiriti Nagesh Gowda"
 __copyright__ = "Copyright 2018 - 2023, AMD ROCm MIVisionX"
 __license__ = "MIT"
-__version__ = "2.5.4"
+__version__ = "2.5.5"
 __maintainer__ = "Kiriti Nagesh Gowda"
 __email__ = "[email protected]"
 __status__ = "Shipping"
@@ -502,7 +502,7 @@
             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 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('(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')
 
     # Install ffmpeg

README.md

@@ -441,7 +441,7 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
 * RPP - [1.2.0](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/1.2.0)
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all the above packages
-* MIVisionX Setup Script - `V2.5.4`
+* MIVisionX Setup Script - `V2.5.5`
 
 ### Known issues
 

docker/mivisionx-on-ubuntu20.dockerfile

@@ -55,9 +55,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ python3 python3-pi
 ENV CUPY_INSTALL_USE_HIP=1
 ENV ROCM_HOME=/opt/rocm
 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/ROCmSoftwarePlatform/cupy.git
-        # CuPy requires Python 3.9+ to build - U20 supports 3.8.10
-        #git submodule update --init && pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && \
+        git submodule update --init && pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
 WORKDIR $MIVISIONX_WORKSPACE

docker/mivisionx-on-ubuntu22.dockerfile

@@ -60,7 +60,7 @@ 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 && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21
 
 ENV MIVISIONX_WORKSPACE=/workspace

docker/pytorch/mivisionx-with-pytorch-with-mesa.dockerfile

@@ -61,7 +61,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse
         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 && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace

docker/pytorch/mivisionx-with-pytorch.dockerfile

@@ -47,7 +47,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse
         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 && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace

docker/tensorflow/mivisionx-with-tensorflow.dockerfile

@@ -52,7 +52,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse
         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 && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 WORKDIR /workspace

docker/ubuntu20/level-5.dockerfile

@@ -55,9 +55,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ python3 python3-pi
 ENV CUPY_INSTALL_USE_HIP=1
 ENV ROCM_HOME=/opt/rocm
 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/ROCmSoftwarePlatform/cupy.git
-        # CuPy requires Python 3.9+ to build - U20 supports 3.8.10
-        #git submodule update --init && pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && \
+        git submodule update --init && pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21 && cd
 
 ENV MIVISIONX_WORKSPACE=/workspace
 WORKDIR $MIVISIONX_WORKSPACE

docker/ubuntu22/level-5.dockerfile

@@ -60,7 +60,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install git g++ hipblas hipsparse
         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 && \
+        git clone -b v12.2.0 https://github.com/ROCmSoftwarePlatform/cupy.git && cd cupy && git submodule update --init && \
         pip install -e . --no-cache-dir -vvvv && pip install numpy==1.21
 
 ENV MIVISIONX_WORKSPACE=/workspace