From 4f68730963095e4b62dd333d72fbb8f7fbb8a61a Mon Sep 17 00:00:00 2001 From: kiritigowda Date: Mon, 10 Jul 2023 13:50:38 -0700 Subject: [PATCH 1/2] SLES - Updates --- CHANGELOG.md | 4 ++-- MIVisionX-setup.py | 15 ++++++++++----- README.md | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 041eee48a6..a87b8fa052 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ + Ubuntu - `20.04` / `22.04` + CentOS - `7` / `8` + RHEL - `8` / `9` - + SLES - `15-SP3` + + SLES - `15-SP4` * ROCm: rocm-core - `5.4.3.50403-121` * miopen-hip - `2.19.0.50403-121` * miopen-opencl - `2.18.0.50300-63` @@ -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.2` +* MIVisionX Setup Script - `V2.5.3` ### Known issues diff --git a/MIVisionX-setup.py b/MIVisionX-setup.py index a0887a32e6..cc522383b4 100644 --- a/MIVisionX-setup.py +++ b/MIVisionX-setup.py @@ -30,7 +30,7 @@ __author__ = "Kiriti Nagesh Gowda" __copyright__ = "Copyright 2018 - 2023, AMD ROCm MIVisionX" __license__ = "MIT" -__version__ = "2.5.2" +__version__ = "2.5.3" __maintainer__ = "Kiriti Nagesh Gowda" __email__ = "mivisionx.support@amd.com" __status__ = "Shipping" @@ -435,6 +435,15 @@ if rocalInstall == 'ON': # Install RPP + # clang + os.system('sudo -v') + os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' ' + + linuxSystemInstall_check+' install clang') + if "SLES" in platfromInfo: + os.system('sudo -v') + os.system('sudo update-alternatives --install /usr/bin/clang clang /opt/rocm-*/llvm/bin/clang 100') + os.system('sudo update-alternatives --install /usr/bin/clang++ clang++ /opt/rocm-*/llvm/bin/clang++ 100') + # OS Deps if "Ubuntu" in platfromInfo: # Install Packages for rocAL os.system('sudo -v') @@ -444,10 +453,6 @@ os.system('sudo -v') os.system('sudo '+linuxFlag+' '+linuxSystemInstall + ' '+linuxSystemInstall_check+' install nasm yasm') - # clang - os.system('sudo -v') - os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' ' + - linuxSystemInstall_check+' install clang') elif "redhat" in platfromInfo or "SLES" in platfromInfo: # Nasm & Yasm os.system('sudo -v') diff --git a/README.md b/README.md index 560368e5a9..527dae9187 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ MIVisionX provides you with tools for accomplishing your tasks throughout the wh + **Ubuntu** - `20.04` / `22.04` + **CentOS** - `7` / `8` + **RedHat** - `8` / `9` - + **SLES** - `15-SP3` + + **SLES** - `15-SP4` * Install [ROCm](https://docs.amd.com) * CMake 3.0 or later * ROCm MIOpen for `Neural Net Extensions` ([vx_nn](amd_openvx_extensions/amd_nn/README.md#openvx-neural-network-extension-library-vx_nn)) @@ -189,7 +189,7 @@ For the convenience of the developer, we provide the setup script `MIVisionX-set + Ubuntu - `20.04` / `22.04` + CentOS - `7` / `8` + RedHat - `8` / `9` - + SLES - `15-SP3` + + SLES - `15-SP4` * [ROCm supported hardware](https://docs.amd.com) * [ROCm](https://docs.amd.com) @@ -455,7 +455,7 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release + Ubuntu - `20.04` / `22.04` + CentOS - `7` / `8` + RHEL - `8` / `9` - + SLES - `15-SP3` + + SLES - `15-SP4` * ROCm: rocm-core - `5.4.3.50403-121` * miopen-hip - `2.19.0.50403-121` * miopen-opencl - `2.18.0.50300-63` @@ -465,7 +465,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.2` +* MIVisionX Setup Script - `V2.5.3` ### Known issues From 77cdcb1ef9bd71a9c2e61335a0cad75751739e8d Mon Sep 17 00:00:00 2001 From: kiritigowda Date: Mon, 10 Jul 2023 15:53:57 -0700 Subject: [PATCH 2/2] FS - SLES Fix --- utilities/mv_deploy/mv_compile.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/utilities/mv_deploy/mv_compile.cpp b/utilities/mv_deploy/mv_compile.cpp index 7515625335..75f51486fc 100644 --- a/utilities/mv_deploy/mv_compile.cpp +++ b/utilities/mv_deploy/mv_compile.cpp @@ -30,9 +30,17 @@ THE SOFTWARE. #include #include #include -#include #include - +#if __cplusplus >= 201703L && __has_include() + #include + namespace fs = std::filesystem; +#elif __has_include() + #include + namespace fs = std::experimental::filesystem; +#elif __has_include() + #include + namespace fs = boost::filesystem; +#endif // helper functions void info(const char * format, ...) { @@ -85,7 +93,7 @@ static mv_status MIVID_API_CALL mvLoadUpdateAndCompileModelForBackend(mivid_back } else { printf("Env MIVISIONX_MODEL_COMPILER_PATH is not specified, using default %s\n", compiler_path.c_str()); } - if (!std::filesystem::exists(model_name)) { + if (!fs::exists(model_name)) { error("model %s does not exist", model_name); return MV_FAILURE; }