Skip to content

Commit

Permalink
rocAL V2.0.0 - Updates and fixes (#131)
Browse files Browse the repository at this point in the history
* CI & Git - Updates

* Version Updates

* Docs - Updates

* Update CODEOWNERS

* Update Doxyfile

* Update Doxyfile

* Revert - Docs

* Version 2.0 - Updates

* Tests - Name change

* Readme - Upgrades

* CMakeLists - Add missing header install

* Tests - Fix for tensors

* Tests - Include Dirs fix

* Tests - Fix

* Tests - Fix name changes

* 2.0 - Fix

* Linting - Remove for develop

* Update CODEOWNERS

* Readme - Updates

* Python Version - User variable

* Test - Fix test name

* Updates

* PyBinding - Fix

* Fix - Setup.pu

* PyBind Setup - Updates

* PyBind - Fix option scope

* Linting - Add dev branch

* Changelog - Fix linting

* Linting -Fix

* PyBind - Wheel version update
  • Loading branch information
kiritigowda authored Apr 11, 2024
1 parent bf0ff22 commit 9fc3e95
Show file tree
Hide file tree
Showing 25 changed files with 654 additions and 478 deletions.
10 changes: 7 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Documentation files
docs/* @ROCm/rocm-documentation
*.md @ROCm/rocm-documentation
*.rst @ROCm/rocm-documentation
docs/* @ROCm/rocm-documentation @kiritigowda @rrawther
*.md @ROCm/rocm-documentation @kiritigowda @rrawther
*.rst @ROCm/rocm-documentation
# Header directory
library/include/* @ROCm/rocm-documentation @kiritigowda @rrawther
# Source code
@kiritigowda @rrawther
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Linting

on:
push:
branches: [develop, main]
branches: [master, develop]
pull_request:
branches: [develop, main]
branches: [master, develop]

jobs:
call-workflow-passing-data:
Expand Down
62 changes: 50 additions & 12 deletions .jenkins/common.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,25 @@ def runCompileCommand(platform, project, jobName, boolean debug=false, boolean s
make -j\$(nproc)
sudo cmake --build . --target PyPackageInstall
sudo make install
LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/rocm/lib${libLocation} make test ARGS="-VV --rerun-failed --output-on-failure"
sudo make package
ldd -v /opt/rocm/lib/librocal.so
"""

platform.runCommand(this, command)
}

def runTestCommand (platform, project) {

String libLocation = ''
if (platform.jenkinsLabel.contains('rhel') || platform.jenkinsLabel.contains('sles')) {
libLocation = ':/usr/local/lib'
}

def command = """#!/usr/bin/env bash
set -x
export HOME=/home/jenkins
echo Make Test
cd ${project.paths.project_build_prefix}/build/release
LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/rocm/lib${libLocation} make test ARGS="-VV --rerun-failed --output-on-failure"
ldd -v /opt/rocm/lib/librocal.so
"""

Expand All @@ -58,32 +63,65 @@ def runTestCommand (platform, project) {
def runPackageCommand(platform, project) {

def packageHelper = platform.makePackage(platform.jenkinsLabel, "${project.paths.project_build_prefix}/build/release")

String packageType = ''
String packageInfo = ''
String packageDetail = ''
String osType = ''
String packageRunTime = ''

String packageType = ""
String packageInfo = ""

if (platform.jenkinsLabel.contains('centos') ||
platform.jenkinsLabel.contains('rhel') ||
platform.jenkinsLabel.contains('sles')) {
if (platform.jenkinsLabel.contains('centos') || platform.jenkinsLabel.contains('rhel') || platform.jenkinsLabel.contains('sles')) {
packageType = 'rpm'
packageInfo = 'rpm -qlp'
packageDetail = 'rpm -qi'
packageRunTime = 'rocal-*'

if (platform.jenkinsLabel.contains('sles')) {
osType = 'sles'
}
else if (platform.jenkinsLabel.contains('centos7')) {
osType = 'centos7'
}
else if (platform.jenkinsLabel.contains('rhel8')) {
osType = 'rhel8'
}
else if (platform.jenkinsLabel.contains('rhel9')) {
osType = 'rhel9'
}
}
else
{
packageType = 'deb'
packageInfo = 'dpkg -c'
packageDetail = 'dpkg -I'
packageRunTime = 'rocal_*'

if (platform.jenkinsLabel.contains('ubuntu20')) {
osType = 'ubuntu20'
}
else if (platform.jenkinsLabel.contains('ubuntu22')) {
osType = 'ubuntu22'
}
}

def command = """#!/usr/bin/env bash
set -x
export HOME=/home/jenkins
echo Make rocAL Package
echo Make rocal Package
cd ${project.paths.project_build_prefix}/build/release
sudo make package
mkdir -p package
mv *.${packageType} package/
mv Testing/Temporary/*.log package/
${packageInfo} package/*.${packageType}
mv rocal-test*.${packageType} package/${osType}-rocal-test.${packageType}
mv rocal-dev*.${packageType} package/${osType}-rocal-dev.${packageType}
mv ${packageRunTime}.${packageType} package/${osType}-rocal.${packageType}
mv Testing/Temporary/LastTest.log ${osType}-LastTest.log
mv Testing/Temporary/LastTestsFailed.log ${osType}-LastTestsFailed.log
${packageDetail} package/${osType}-rocal-test.${packageType}
${packageDetail} package/${osType}-rocal-dev.${packageType}
${packageDetail} package/${osType}-rocal.${packageType}
${packageInfo} package/${osType}-rocal-test.${packageType}
${packageInfo} package/${osType}-rocal-dev.${packageType}
${packageInfo} package/${osType}-rocal.${packageType}
"""

platform.runCommand(this, command)
Expand Down
55 changes: 48 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,69 @@

[rocAL Documentation](https://github.com/ROCm/rocAL)

## rocAL 1.0.0 (unreleased)
## rocAL 2.0.0 (unreleased)

### Added

*
* Packages - dev & tests

### Optimizations

*
* Tests

### Changed

*
* Image to tensor updates

### Fixed

*
* tests & readme

### Tested Configurations

* Linux distribution
+ Ubuntu - `20.04` / `22.04`
* Ubuntu - `20.04` / `22.04`
* CentOS - `7`
* RedHat - `8` / `9`
* SLES - `15-SP4`
* ROCm: rocm-core - `5.7.0.50700-6`
* RPP - `rpp` & `rpp-dev`/`rpp-devel`
* MIVisionX - `mivisionx` & `mivisionx-dev`/`mivisionx-devel`
* Turbo JPEG - [Version 3.0.1](https://libjpeg-turbo.org/) - Version 3.0.1
* Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
* 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)
* RapidJSON- [master](https://github.com/Tencent/rapidjson)
* PyBind11 - [v2.10.4](https://github.com/pybind/pybind11)
* rocAL Setup Script - `V1.1.0`
* Dependencies for all the above packages

### Known issues

* Requires custom deps install

## rocAL 1.0.0

### Added

* rocAL Tests

### Optimizations

* Image augmentations

### Changed

* Deps

### Fixed

* minor issues

### Tested Configurations

* Linux distribution
* Ubuntu - `20.04` / `22.04`
* ROCm: rocm-core - `6.0.60002-1`
* Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
* OpenCV - [4.6.0](https://github.com/opencv/opencv/releases/tag/4.6.0)
Expand All @@ -39,4 +80,4 @@

### Known issues

*
* Requires custom version of libturbo-JPEG
Loading

0 comments on commit 9fc3e95

Please sign in to comment.