Skip to content

Commit c64df3c

Browse files
authored
CTest - Capture OCL Failures (#1524)
* CTest - Capture OCL Failures * Test - remove duplicate * Test - macOS Fix & Hidden test fix
1 parent 8e62d4f commit c64df3c

10 files changed

+11
-9
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ message("-- ${BoldBlue}MIVisionX Version -- ${VERSION}${ColourReset}")
8888
message("-- ${BoldBlue}MIVisionX Install Path -- ${CMAKE_INSTALL_PREFIX}${ColourReset}")
8989

9090
if(APPLE)
91-
set(CMAKE_MACOSX_RPATH 1)
92-
set(BUILD_WITH_INSTALL_RPATH ON)
91+
set(CMAKE_MACOSX_RPATH ON)
92+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
9393
set(GPU_SUPPORT OFF)
9494
set(BACKEND "CPU")
9595
message("-- ${Magenta}Apple macOS Detected -- GPU Support turned OFF${ColourReset}")
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/amd_openvx_gdfs/runOpenVX.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def get_gdf_names(directory):
194194
print(" %-5s - %-30s" % ('Test ID', 'GDF Name'))
195195
for i in range(len(cpuNodes)):
196196
print(" %-5d - %-30s" % ((i+1), cpuNodes[i]))
197-
if hiddenNodes:
197+
if hiddenTests == 'YES' and hiddenNodes:
198198
print("\nHidden CPU Node Tests\n")
199199
print(" %-5s - %-30s" % ('Test ID', 'GDF Name'))
200200
for i in range(len(hiddenNodes)):
@@ -274,11 +274,13 @@ def get_gdf_names(directory):
274274
ERROR_CHECK(os.system('echo '+testFileName))
275275
ERROR_CHECK(os.system(RunVXapp+' -dump-gdf -frames:'+str(numFrames)+' -affinity:'+hardwareMode+' -dump-profile file '+scriptPath+'/cpu/'+testFileName))
276276
print("\n")
277-
for i in range(len(hiddenNodes)):
278-
testFileName = hiddenNodes[i]
279-
print("Failures: Running GDF - "+str(i+1)+':'+testFileName)
280-
ERROR_CHECK(os.system('echo '+testFileName))
281-
(os.system(RunVXapp+' -dump-gdf -frames:'+str(numFrames)+' -affinity:'+hardwareMode+' -dump-profile file '+scriptPath+'/cpu/hidden/'+testFileName))
282-
print("\n")
277+
if hiddenTests == 'YES':
278+
for i in range(len(hiddenNodes)):
279+
testFileName = hiddenNodes[i]
280+
print("Failures: Running GDF - "+str(i+1)+':'+testFileName)
281+
ERROR_CHECK(os.system('echo '+testFileName))
282+
# Tests are not error checked -- Expected failures
283+
(os.system(RunVXapp+' -dump-gdf -frames:'+str(numFrames)+' -affinity:'+hardwareMode+' -dump-profile file '+scriptPath+'/cpu/hidden/'+testFileName))
284+
print("\n")
283285

284286
print("\nrunOpenVX.py completed - V:"+__version__+"\n")

0 commit comments

Comments
 (0)