diff --git a/.jenkins/common.groovy b/.jenkins/common.groovy index 1c2fe7c1da..a4cbd91490 100644 --- a/.jenkins/common.groovy +++ b/.jenkins/common.groovy @@ -53,12 +53,35 @@ def runCompileCommand(platform, project, jobName, boolean debug=false, boolean s } def runTestCommand (platform, project) { + + String conformaceCPU = 'echo OpenVX 1.3 Conformance - CPU - NOT TESTED ON THIS PLATFORM' + String conformaceGPU = 'echo OpenVX 1.3 Conformance - GPU - NOT TESTED ON THIS PLATFORM' + + if (platform.jenkinsLabel.contains('centos') || platform.jenkinsLabel.contains('ubuntu')) { + conformaceCPU = 'AGO_DEFAULT_TARGET=CPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance' + conformaceGPU = 'AGO_DEFAULT_TARGET=GPU LD_LIBRARY_PATH=./lib ./bin/vx_test_conformance --filter=-HarrisCorners.*:-*.ReplicateNode:-*.ImageContainmentRelationship:-*.OnRandomAndNatural:-*.vxWeightedAverage:-vxCanny.*:-*.MapRandomRemap:*.*' + } + def command = """#!/usr/bin/env bash set -x cd ${project.paths.project_build_prefix}/build/release python ../../tests/vision_tests/runVisionTests.py --runvx_directory ./bin --hardware_mode CPU --num_frames 100 python ../../tests/vision_tests/runVisionTests.py --runvx_directory ./bin --hardware_mode GPU --num_frames 100 python ../../tests/neural_network_tests/runNeuralNetworkTests.py + export OPENVX_DIR=\$(pwd)/. + export OPENVX_INC=\$(pwd)/../../amd_openvx/openvx + mkdir conformance_tests + cd conformance_tests + git clone -b openvx_1.3 https://github.com/KhronosGroup/OpenVX-cts.git + export VX_TEST_DATA_PATH=\$(pwd)/OpenVX-cts/test_data/ + mkdir build-cts + cd build-cts + cmake -DOPENVX_INCLUDES=\$OPENVX_INC/include -DOPENVX_LIBRARIES=\$OPENVX_DIR/lib/libopenvx.so\\;\$OPENVX_DIR/lib/libvxu.so\\;pthread\\;dl\\;m\\;rt -DOPENVX_CONFORMANCE_VISION=ON ../OpenVX-cts + cmake --build . + echo MIVisionX OpenVX 1.3 Conformance - CPU + ${conformaceCPU} + echo MIVisionX OpenVX 1.3 Conformance - GPU - OpenCL + ${conformaceGPU} """ platform.runCommand(this, command) diff --git a/.travis.yml b/.travis.yml index c2297bf998..b187b08e6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: cpp sudo: required -dist: xenial +dist: bionic os: - linux compiler: diff --git a/README.md b/README.md index 9ea132c5de..a545c3115b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT) [![doc](https://img.shields.io/badge/doc-readthedocs-blueviolet)](https://gpuopen-professionalcompute-libraries.github.io/MIVisionX/) -[![Build Status](https://travis-ci.org/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.svg?branch=master)](https://travis-ci.org/GPUOpen-ProfessionalCompute-Libraries/MIVisionX) +[![Build Status](https://travis-ci.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.svg?branch=master)](https://travis-ci.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX)