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

rocAL V2.0.0 - Updates and fixes #131

Merged
merged 32 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b53dbc1
CI & Git - Updates
kiritigowda Apr 9, 2024
4170d1a
Version Updates
kiritigowda Apr 9, 2024
dcfbe48
Docs - Updates
kiritigowda Apr 9, 2024
95df5e2
Update CODEOWNERS
kiritigowda Apr 9, 2024
c86dc94
Update Doxyfile
kiritigowda Apr 9, 2024
5fe3d2c
Update Doxyfile
kiritigowda Apr 9, 2024
f1c8e24
Revert - Docs
kiritigowda Apr 9, 2024
a62f0c6
Merge remote-tracking branch 'refs/remotes/origin/kg/cmakelist-update…
kiritigowda Apr 9, 2024
d4d1918
Version 2.0 - Updates
kiritigowda Apr 10, 2024
922bd63
Tests - Name change
kiritigowda Apr 10, 2024
bda7142
Readme - Upgrades
kiritigowda Apr 10, 2024
621d96c
CMakeLists - Add missing header install
kiritigowda Apr 10, 2024
ce3a478
Tests - Fix for tensors
kiritigowda Apr 10, 2024
bb4f55a
Tests - Include Dirs fix
kiritigowda Apr 10, 2024
862b9f4
Tests - Fix
kiritigowda Apr 10, 2024
ea172d2
Tests - Fix name changes
kiritigowda Apr 10, 2024
b70b5cb
2.0 - Fix
kiritigowda Apr 10, 2024
a3af17f
Linting - Remove for develop
kiritigowda Apr 10, 2024
80fe39f
Update CODEOWNERS
kiritigowda Apr 10, 2024
03a9ba4
Readme - Updates
kiritigowda Apr 11, 2024
75a0e6d
Merge remote-tracking branch 'refs/remotes/origin/kg/cmakelist-update…
kiritigowda Apr 11, 2024
cdbdc2c
Python Version - User variable
kiritigowda Apr 11, 2024
83076c8
Test - Fix test name
kiritigowda Apr 11, 2024
add5182
Updates
kiritigowda Apr 11, 2024
94e9f36
PyBinding - Fix
kiritigowda Apr 11, 2024
edf4b77
Fix - Setup.pu
kiritigowda Apr 11, 2024
5e1ec6e
PyBind Setup - Updates
kiritigowda Apr 11, 2024
1682580
PyBind - Fix option scope
kiritigowda Apr 11, 2024
581d573
Linting - Add dev branch
kiritigowda Apr 11, 2024
2b96c3f
Changelog - Fix linting
kiritigowda Apr 11, 2024
db38ed0
Linting -Fix
kiritigowda Apr 11, 2024
da8f160
PyBind - Wheel version update
kiritigowda Apr 11, 2024
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
10 changes: 7 additions & 3 deletions .github/CODEOWNERS
kiritigowda marked this conversation as resolved.
Show resolved Hide resolved
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]
kiritigowda marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
branches: [develop, main]
branches: [master]

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
54 changes: 48 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,65 @@

[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`
+ 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

Expand All @@ -39,4 +81,4 @@

### Known issues

*
* Requires custom version of libturbo-JPEG
Loading