Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MIVisionX Setup - Updates #1343

Merged
merged 1 commit into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Documentation for MIVisionX is available at
* OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.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.6.1`
* MIVisionX Setup Script - `V3.1.0`

### Known issues

Expand Down
8 changes: 6 additions & 2 deletions MIVisionX-setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@
import sys
import argparse
import platform
import traceback
if sys.version_info[0] < 3:
import commands
else:
import subprocess

__copyright__ = "Copyright 2018 - 2024, AMD ROCm MIVisionX"
__license__ = "MIT"
__version__ = "3.0.0"
__version__ = "3.1.0"
__email__ = "mivisionx.support@amd.com"
__status__ = "Shipping"

Expand All @@ -38,6 +39,7 @@ def ERROR_CHECK(call):
status = call
if(status != 0):
print('ERROR_CHECK failed with status:'+str(status))
traceback.print_stack()
exit(status)

# Arguments
Expand Down Expand Up @@ -185,6 +187,8 @@ def ERROR_CHECK(call):
platfromInfo = platfromInfo+'-Ubuntu-20'
elif "22" in platform.version():
platfromInfo = platfromInfo+'-Ubuntu-22'
elif "24" in platform.version():
platfromInfo = platfromInfo+'-Ubuntu-24'
else:
platfromInfo = platfromInfo+'-Ubuntu-undefined-version'
elif os.path.exists('/usr/bin/zypper'):
Expand Down Expand Up @@ -388,7 +392,7 @@ def ERROR_CHECK(call):
ERROR_CHECK(os.system(
'(cd '+modelCompilerDeps+'/nnef-deps; git clone https://github.com/KhronosGroup/NNEF-Tools.git)'))
ERROR_CHECK(os.system(
'(cd '+modelCompilerDeps+'/nnef-deps/NNEF-Tools/parser/cpp; mkdir -p build && cd build; '+linuxCMake+' ..; make)'))
'(cd '+modelCompilerDeps+'/nnef-deps/NNEF-Tools/parser/cpp; mkdir -p build && cd build; '+linuxCMake+' ..; make -j$(nproc))'))
ERROR_CHECK(os.system(
'(cd '+modelCompilerDeps+'/nnef-deps/NNEF-Tools/parser/python; sudo python3 setup.py install)'))
else:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
* OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.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.7.0`
* MIVisionX Setup Script - `V3.1.0`

### Known issues

Expand Down
2 changes: 1 addition & 1 deletion docs/install/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ Tested configurations
* OpenCV - `4.6.0 <https://github.com/opencv/opencv/releases/tag/4.6.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.7.0
* MIVisionX Setup Script - V3.1.0

Known issues
-------------------
Expand Down