From 1ef7c216413eec4b9196e9d7a62b682edd7e453d Mon Sep 17 00:00:00 2001 From: Aryan Salmanpour Date: Tue, 26 Mar 2024 12:48:27 -0400 Subject: [PATCH] code cleanup - update the setup script (#3) * code cleanup - update the setup script * fix few typo erros --- README.md | 7 +++---- rocJPEG-setup.py | 10 +--------- samples/jpegDecode/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index af26df2728..fff84e1513 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP >[!NOTE] > * All package installs are shown with the `apt` package manager. Use the appropriate package manager for your operating system. -> * To install rocDecode with minimum requirements, follow the [quick-start](./docs/install/quick-start.rst) instructions +> * To install rocJPEG with minimum requirements, follow the [quick-start](./docs/install/quick-start.rst) instructions #### Prerequisites setup script for Linux @@ -66,7 +66,6 @@ For your convenience, we provide the setup script, ```shell python rocJPEG-setup.py --rocm_path [ ROCm Installation Path - optional (default:/opt/rocm)] - --developer [ Setup Developer Options - optional (default:ON) [options:ON/OFF]] ``` **NOTE:** This script only needs to be executed once. @@ -151,7 +150,7 @@ To verify your installation using a sample application, run: mkdir rocjpeg-sample && cd rocjpeg-sample cmake /opt/rocm/share/rocjpeg/samples/jpegDecode/ make -j8 -./videodecode -i /opt/rocm/share/rocjpeg/image/mug_420.jpg +./jpegdecode -i /opt/rocm/share/rocjpeg/image/mug_420.jpg ``` ### Using test package @@ -173,7 +172,7 @@ individual folders to build and run the samples. ## Docker -You can find rocDecode Docker containers in our +You can find rocJPEG Docker containers in our [GitHub repository](https://github.com/ROCm/rocJPEG/tree/develop/docker). ## Documentation diff --git a/rocJPEG-setup.py b/rocJPEG-setup.py index bfdf7b3618..ee87682e66 100644 --- a/rocJPEG-setup.py +++ b/rocJPEG-setup.py @@ -36,11 +36,8 @@ __status__ = "Shipping" parser = argparse.ArgumentParser() parser.add_argument('--rocm_path', type=str, default='/opt/rocm', help='ROCm Installation Path - optional (default:/opt/rocm) - ROCm Installation Required') -parser.add_argument('--developer', type=str, default='ON', - help='Setup Developer Options - optional (default:ON) [options:ON/OFF]') args = parser.parse_args() -developerInstall = args.developer.upper() ROCM_PATH = args.rocm_path @@ -58,11 +55,6 @@ else: print("ERROR: rocJPEG Setup requires ROCm install\n") exit(-1) -if developerInstall not in ('OFF', 'ON'): - print( - "ERROR: Developer Option Not Supported - [Supported Options: OFF or ON]\n") - exit() - # get platfrom info platfromInfo = platform.platform() @@ -103,7 +95,7 @@ elif os.path.exists('/usr/bin/zypper'): platfromInfo = platfromInfo+'-SLES' else: print("\nrocJPEG Setup on "+platfromInfo+" is unsupported\n") - print("\nrocJPEG Setup Supported on: Ubuntu 20/22; CentOS 7/8; RedHat 8/9; & SLES 15 SP4\n") + print("\nrocJPEG Setup Supported on: Ubuntu 20/22; CentOS 8; RedHat 8/9; & SLES 15 SP5\n") exit(-1) # rocJPEG Setup diff --git a/samples/jpegDecode/CMakeLists.txt b/samples/jpegDecode/CMakeLists.txt index f3200a2bd1..20ef70a9f5 100644 --- a/samples/jpegDecode/CMakeLists.txt +++ b/samples/jpegDecode/CMakeLists.txt @@ -68,6 +68,6 @@ else() message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install ROCm and HIP!") endif() if (NOT ROCJPEG_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + message(FATAL_ERROR "-- ERROR!: rocJPEG Not Found! - please install rocJPEG!") endif() endif() \ No newline at end of file