Skip to content

Commit

Permalink
SLES - Updates (#1129)
Browse files Browse the repository at this point in the history
* SLES - Updates

* FS - SLES Fix
  • Loading branch information
kiritigowda committed Jul 10, 2023
1 parent 19b99e2 commit 8cbd2e8
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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

Expand Down
15 changes: 10 additions & 5 deletions MIVisionX-setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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')
Expand All @@ -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')
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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)

Expand Down Expand Up @@ -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`
Expand All @@ -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

Expand Down
14 changes: 11 additions & 3 deletions utilities/mv_deploy/mv_compile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,17 @@ THE SOFTWARE.
#include <string>
#include <sstream>
#include <sys/stat.h>
#include <filesystem>
#include <unistd.h>

#if __cplusplus >= 201703L && __has_include(<filesystem>)
#include <filesystem>
namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#elif __has_include(<boost/filesystem.hpp>)
#include <boost/filesystem.hpp>
namespace fs = boost::filesystem;
#endif
// helper functions
void info(const char * format, ...)
{
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 8cbd2e8

Please sign in to comment.