Merge branch 'develop' into spec_example_notebook

ROCm · Aug 9, 2024 · 4abcc17 · 4abcc17
2 parents da065fd + da8cadb
commit 4abcc17
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -61,10 +61,10 @@
 * RapidJSON - `https://github.com/Tencent/rapidjson`
 * Turbo JPEG - [Version 3.0.2](https://libjpeg-turbo.org/)
 * PyBind11 - [v2.11.1](https://github.com/pybind/pybind11)
-* FFMPEG - `ffmpeg` dev package
+* FFMPEG - `ffmpeg 4` dev package
 * OpenCV - `libopencv` / [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
 * libsndfile - [1.0.31](https://github.com/libsndfile/libsndfile/releases/tag/1.0.31)
-* rocAL Setup Script - `V2.4.0`
+* rocAL Setup Script - `V2.5.0`
 * Dependencies for all the above packages
 
 ### Known issues

diff --git a/README.md b/README.md
@@ -326,5 +326,5 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
 * FFMPEG - `ffmpeg` dev package
 * OpenCV - `libopencv-dev` / [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
 * libsndfile - [1.0.31](https://github.com/libsndfile/libsndfile/releases/tag/1.0.31)
-* rocAL Setup Script - `V2.4.0`
+* rocAL Setup Script - `V2.5.0`
 * Dependencies for all the above packages
diff --git a/docs/README.md b/docs/README.md
@@ -45,25 +45,25 @@ Refer [rocAL build instructions](https://github.com/ROCm/rocAL#build-instruction
 * Contains the image augmentations & file read and decode operations which are linked to rocAL C++ API
 * All ops (listed below) are supported for the single input image and batched inputs.
 
-| Image Augmentation |   Reader and Decoder      |        Geometric Ops         |
-| :----------------: | :-----------------------: | :--------------------------: |
-|    Color Twist     |   Image File Reader       |     Crop Mirror Normalize    |
-| Color Temperature  |      Caffe Reader         |          Crop Resize         |
-|     Brightness     |      Caffe2 Reader        |            Resize            |
-|  Gamma Correction  |      CIFAR10 Reader       |          Random Crop         |
-|        Snow        |       COCO Reader         |         Warp Affine          |
-|        Rain        |     TF Record Reader      |           Fish Eye           |
-|        Blur        |   MXNet Record Reader     |        Lens Correction       |
-|       Jitter       |    Video File Reader      |           Rotate             |
-|        Hue         |     Image Decoder         |            Crop              |
-|     Saturation     | Image Decoder Random Crop |            Flip              |
-|        Fog         |      Video Decoder        |    Resize Crop Mirror        |
-|      Contrast      |                           | Resize Crop Mirror Normalize |
-|      Vignette      |                           |                              |
-|     SNP Noise      |                           |                              |
-|      Pixelate      |                           |                              |
-|       Blend        |                           |                              |
-|      Exposure      |                           |                              |
+| Image Augmentation |   Reader and Decoder      |        Geometric Ops         |     Audio Augmentation     |
+| :----------------: | :-----------------------: | :--------------------------: | :------------------------: |
+|    Color Twist     |   Image File Reader       |     Crop Mirror Normalize    |    PreEmphasis Filter      |
+| Color Temperature  |      Caffe Reader         |          Crop Resize         |      Non-Silent Region     |
+|     Brightness     |      Caffe2 Reader        |            Resize            |          Resample          |
+|  Gamma Correction  |      CIFAR10 Reader       |          Random Crop         |        Spectrogram         |
+|        Snow        |       COCO Reader         |         Warp Affine          |        Mel-Filter Bank     |
+|        Rain        |     TF Record Reader      |           Fish Eye           |          ToDecibels        |
+|        Blur        |   MXNet Record Reader     |        Lens Correction       |          Normalize         |
+|       Jitter       |    Video File Reader      |           Rotate             |                            |  
+|        Hue         |     Image Decoder         |            Crop              |                            |
+|     Saturation     | Image Decoder Random Crop |            Flip              |                            |
+|        Fog         |      Video Decoder        |    Resize Crop Mirror        |                            |
+|      Contrast      |      Audio Decoder        | Resize Crop Mirror Normalize |                            |
+|      Vignette      |                           |            Slice             |                            |
+|     SNP Noise      |                           |                              |                            |
+|      Pixelate      |                           |                              |                            |
+|       Blend        |                           |                              |                            |
+|      Exposure      |                           |                              |                            |
 
 ### amd.rocal.pipeline
 
@@ -80,6 +80,7 @@ amd.rocal.types are enums exported from C++ API to python. Some examples include
 
 * Contains ROCALGenericIterator for Pytorch.
 * ROCALClassificationIterator class implements iterator for image classification and return images with corresponding labels.
+* ROCALAudioIterator class for audio tasks and returns audio data, corresponding labels and its roi.
 * From the above classes, any hybrid iterator pipeline can be created by adding augmentations.
 * See example [PyTorch Simple Example](./examples/pytorch/). Requires PyTorch.
 

diff --git a/docs/how-to/framework.rst b/docs/how-to/framework.rst
@@ -191,7 +191,7 @@ Follow these steps:
                     train_label_one_hot_list = get_label_one_hot(train_label_ndArray)
 
 
-4. To see and run a sample training script, refer to `rocAL TensorFlow example <https://github.com/ROCm/rocAL/tree/master/rocAL/docs/examples/tf/pets_training>`_.
+4. To see and run a sample training script, refer to `rocAL TensorFlow example <https://github.com/ROCm/rocAL/tree/master/docs/examples/tf/pets_training>`_.
 
 .. __resnet50:
 

diff --git a/docs/how-to/overview.rst b/docs/how-to/overview.rst
@@ -109,4 +109,4 @@ Decoders                Description
 ======================  ========================================
 
 To see examples demonstrating the usage of decoders and readers, see 
-`rocAL Python Examples <https://github.com/ROCm/rocAL/tree/master/rocAL/docs/examples>`_.
+`rocAL Python Examples <https://github.com/ROCm/rocAL/tree/master/docs/examples>`_.
diff --git a/docs/user_guide/ch1.md b/docs/user_guide/ch1.md
@@ -80,4 +80,4 @@ rocAL operators offer the flexibility to run on CPU or GPU for building hybrid p
 | Image_random_crop | Decodes and randomly crops JPEG images |
 | Image_slice       | Decodes and slices JPEG images         |
 
-To see examples demonstrating the usage of decoders and readers, [click here](https://github.com/ROCm/rocAL/tree/master/rocAL/docs/examples)
+To see examples demonstrating the usage of decoders and readers, [click here](https://github.com/ROCm/rocAL/tree/master/docs/examples)
diff --git a/rocAL-setup.py b/rocAL-setup.py
@@ -30,7 +30,7 @@
 
 __copyright__ = "Copyright 2022 - 2024, AMD ROCm Augmentation Library"
 __license__ = "MIT"
-__version__ = "2.4.0"
+__version__ = "2.5.0"
 __email__ = "mivisionx.support@amd.com"
 __status__ = "Shipping"
 
@@ -297,11 +297,6 @@ def ERROR_CHECK(call):
     'libopencv-dev'
 ]
 
-slesOptionalPackages = [
-    'ffmpeg-devel',
-    'opencv-dev'
-]
-
 # Install
 ERROR_CHECK(os.system(sudoValidate))
 if os.path.exists(deps_dir):
@@ -358,7 +353,7 @@ def ERROR_CHECK(call):
 
     #pip3 packages
     for i in range(len(pip3Packages)):
-        ERROR_CHECK(os.system('sudo pip3 install '+ pip3Packages[i]))
+        ERROR_CHECK(os.system('pip3 install '+ pip3Packages[i]))
 
     # turbo-JPEG - https://github.com/libjpeg-turbo/libjpeg-turbo.git -- 3.0.2
     turboJpegVersion = '3.0.2'
@@ -376,12 +371,8 @@ def ERROR_CHECK(call):
     os.system('(cd '+deps_dir+'; git clone https://github.com/Tencent/rapidjson.git; cd rapidjson; mkdir build; cd build; ' +	
             linuxCMake+' ../; make -j$(nproc); sudo make install)')
 
-# Optional Deps
-    if "SLES" in platfromInfo:
-        for i in range(len(slesOptionalPackages)):
-                ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
-                                ' '+linuxSystemInstall_check+' install -y '+ slesOptionalPackages[i]))
-    elif "Ubuntu" in platfromInfo:
+    # Optional Deps
+    if "Ubuntu" in platfromInfo:
         for i in range(len(debianOptionalPackages)):
                 ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall +
                                 ' '+linuxSystemInstall_check+' install -y '+ debianOptionalPackages[i]))
@@ -414,7 +405,12 @@ def ERROR_CHECK(call):
                 ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
                         ' install https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm'))
                 ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
-                        ' install ffmpeg ffmpeg-free-devel'))
+                        ' install ffmpeg ffmpeg-devel'))
+            elif "SLES" in platfromInfo:
+                ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
+                        ' install ffmpeg-4 ffmpeg-4-libavcodec-devel ffmpeg-4-libavformat-devel'))
+                ERROR_CHECK(os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
+                        ' install ffmpeg-4-libavutil-devel ffmpeg-4-libswscale-devel'))
 
         # Install OpenCV -- TBD cleanup
         opencvVersion = '4.6.0'
@@ -433,7 +429,7 @@ def ERROR_CHECK(call):
             '(cd '+deps_dir+'; wget https://github.com/opencv/opencv/archive/'+opencvVersion+'.zip )'))
         ERROR_CHECK(os.system('(cd '+deps_dir+'; unzip '+opencvVersion+'.zip )'))
         ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; '+linuxCMake +
-                ' -D WITH_GTK=ON -D WITH_JPEG=ON -D BUILD_JPEG=ON -D WITH_OPENCL=OFF -D WITH_OPENCLAMDFFT=OFF -D WITH_OPENCLAMDBLAS=OFF -D WITH_VA_INTEL=OFF -D WITH_OPENCL_SVM=OFF  -D CMAKE_INSTALL_PREFIX=/usr/local ../../opencv-'+opencvVersion+' )'))
+                ' -D WITH_EIGEN=OFF -D WITH_GTK=ON -D WITH_JPEG=ON -D BUILD_JPEG=ON -D WITH_OPENCL=OFF -D WITH_OPENCLAMDFFT=OFF -D WITH_OPENCLAMDBLAS=OFF -D WITH_VA_INTEL=OFF -D WITH_OPENCL_SVM=OFF  -D CMAKE_INSTALL_PREFIX=/usr/local ../../opencv-'+opencvVersion+' )'))
         ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; make -j$(nproc))'))
         ERROR_CHECK(os.system(sudoValidate))
         ERROR_CHECK(os.system('(cd '+deps_dir+'/build/OpenCV; sudo make install)'))