Merge pull request #26 from denolf/master

2018.3 release

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "frameworks/cmakeModules/cmakeModulesXilinx"]
+	path = frameworks/cmakeModules/cmakeModulesXilinx
+	url = https://github.com/Xilinx/cmakeModules

README.md

@@ -2,7 +2,7 @@
 
 All PYNQ releases ship with the popular [OpenCV](https://opencv.org/) library pre-installed. The PYNQ computer vision overlays enable accelerating OpenCV components in Programmable Logic (PL). These overlays expose a subset Xilinx' [xfOpenCV](https://github.com/Xilinx/xfopencv) library (a part of Xilinx' [reVISION solution](https://www.xilinx.com/products/design-tools/embedded-vision-zone.html)) at the Python level, combined with the support for HDMI input/output (Pynq-Z1 and Pynq-Z2 only). Webcam, stream or file based input/output remains available through the pre-installed SW OpenCV (on all Pynq boards).
 
-Currently this package is compatible with [PYNQ image v2.3](http://www.pynq.io/board).
+Currently this package is compatible with [PYNQ image v2.4](http://www.pynq.io/board).
 
 ![](./block_diagram.png)
 
@@ -29,7 +29,7 @@ After the setup, new Jupyter notebooks will be added under the pynqOpenCV folder
 
 When after profiling, the critical OpenCV modules in an application are identified, the generation of a tailored overlay is easily done by specifying those modules as a list in a CMake project file. After that, building the tailored overlay only requires running cmake to generate the Makefiles followed by make to build the overlay.
 
-For detailed instructions:  [Building xfOpenCV Overlays for Pynq: CMake based sds++ cross-compilation](overlays/README.md). Currently, this only supports building on the Ultra96 with 2018.2 Xilinx tools.
+For detailed instructions:  [Building xfOpenCV Overlays for Pynq: CMake based sds++ cross-compilation](overlays/README.md). Currently, this only supports building on the Ultra96 with 2018.3 Xilinx tools.
 
 ## License
 

applicationCode/unitTests/testC++/buildUnitTest.py

@@ -47,16 +47,27 @@
 from distutils.dir_util import mkpath
 import shutil
 
-toolchain_file  = "../../../../../frameworks/cmakeModules/toolchain_sdx2018.2.cmake"
+toolchain_file  = "../../../../../frameworks/cmakeModules/cmakeModulesXilinx/toolchain_sds.cmake"
 arch            = "arm64"
 clockID         = "3"
-platform        = "/platforms/Ultra96/bare/2018.2/ultra"
+platform        = "/group/xrlabs/projects/image_processing/platforms/Ultra96/ultra_v2.4/2018.3/ultra"
 usePL           = "ON"
 noBitstream     = "OFF"
 noSDCardImage   = "ON"
-unitTestFileDir = "unitTestFiles"
-buildDir        = "build"
+unitTestFileDir = "unitTestFilesUltra96"
+buildDir        = "buildUltra96"
 
+#clockID         = "2"
+#platform        = "/group/xrlabs/tools/reVISION/platforms/zcu102_rv_ss/2018.3/zcu102_rv_ss"
+#platform        = "/group/xrlabs/tools/reVISION/platforms/zcu104_rv_min_2019.1"
+#usePL           = "ON"
+#noBitstream     = "OFF"
+#noSDCardImage   = "ON"
+#unitTestFileDir = "unitTestFilesZCU102"
+#buildDir        = "buildzcu102"
+
+#unitTestFileDir = "unitTestFilesCSIM"
+#buildDir        = "build2019.1"
 
 #*****************************************************************************
 # Create a conversion .bif file
@@ -87,15 +98,15 @@ def buildUnitTest(component):
     #run cmake here
     os.system("cmake .. -DCMAKE_TOOLCHAIN_FILE="+toolchain_file+" -DSDxArch="+arch+" -DSDxClockID="+clockID+" -DSDxPlatform="+platform+" -DusePL="+usePL+" -DnoBitstream="+noBitstream+" -DnoSDCardImage="+noSDCardImage+" >& cmake.log") 
     if '-- Build files have been written to' in open('cmake.log').read():
-        print("\t CMake OK", end='')
+        print("\t CMake OK", end='', flush=True)
     else:
-        print("\t CMake FAIL", end='')
+        print("\t CMake FAIL", end='', flush=True)
     #run make
     os.system("make "+target+" >&  make.log")
     if '[100%] Built target' in open('make.log').read():
-        print("\t build OK")
+        print("\t build OK", flush=True)
     else:
-        print("\t build FAIL")
+        print("\t build FAIL", flush=True)
         os.chdir("..")
         return
     #convert bitstream

applicationCode/unitTests/testC++/testXfAbsdiff/CMakeLists.txt

@@ -37,7 +37,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules/cmakeModulesXilinx ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules)
-include(rulesForSDxXfOpenCV)
+include(rulesForXfOpenCV)
 SET(componentName absdiff)
 
-createXfOpenCVUnitTestPL("../../../.." ${componentName})
+createXfOpenCVUnitTestPL("../../../.." ${componentName})

applicationCode/unitTests/testC++/testXfAbsdiff/src/goldenOpenCVAbsdiff.cpp

@@ -90,8 +90,8 @@ int main ( int argc, char** argv )
   initializeSingleImageTest(fileName1, src1);
   initializeSingleImageTest(fileName2, src2);
 
-  cvtColor(src1, gray1, CV_BGR2GRAY, 1);
-  cvtColor(src2, gray2, CV_BGR2GRAY, 1);
+  cvtColor(src1, gray1, COLOR_BGR2GRAY, 1);
+  cvtColor(src2, gray2, COLOR_BGR2GRAY, 1);
 
   if (numberOfIterations > 0) {
     HRTimer timer;

applicationCode/unitTests/testC++/testXfAbsdiff/src/testSDxXfAbsdiff.cpp

@@ -124,10 +124,12 @@ int main ( int argc, char** argv )
 	xF::Mat dstHLS(height, width, CV_8UC1);
 
 	//convert 3-channel image into 1-channel image
-	cvtColor(src1, src1HLS, CV_BGR2GRAY, 1);	
-	cvtColor(src2, src2HLS, CV_BGR2GRAY, 1);
-	cvtColor(src1, src1InY, CV_BGR2GRAY, 1);	
-	cvtColor(src2, src2InY, CV_BGR2GRAY, 1);
+	cvtColor(src1, src1InY, COLOR_BGR2GRAY, 1);	
+	cvtColor(src2, src2InY, COLOR_BGR2GRAY, 1);
+	//cvtColor(src1, src1HLS, COLOR_BGR2GRAY, 1);	
+	//cvtColor(src2, src2HLS, COLOR_BGR2GRAY, 1);
+	src1HLS.copyFromCvMat(src1InY);
+	src2HLS.copyFromCvMat(src2InY);
 
 	// Apply OpenCV reference Absdiff
 	std::cout << "running golden model" << std::endl;
@@ -152,7 +154,7 @@ int main ( int argc, char** argv )
 	int numberOfDifferences = 0;
 	double errorPerPixel = 0;
 	imageCompare(dstHLS, dstSW, numberOfDifferences, errorPerPixel, true, false);
-	std::cout << "number of differences: " << numberOfDifferences << " average L2 error: " << errorPerPixel << std::endl;
+	std::cout << "number of differences: " << numberOfDifferences << " average L1 error: " << errorPerPixel << std::endl;
 
 	//write back images in files
 	if (writeSWResult)

applicationCode/unitTests/testC++/testXfAccumulate/CMakeLists.txt

@@ -37,7 +37,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules/cmakeModulesXilinx ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules)
-include(rulesForSDxXfOpenCV)
+include(rulesForXfOpenCV)
 SET(componentName accumulate)
 
 createXfOpenCVUnitTestPL("../../../.." ${componentName})

applicationCode/unitTests/testC++/testXfAccumulate/src/goldenOpenCVAccumulate.cpp

@@ -86,7 +86,7 @@ int main ( int argc, char** argv )
   initializeSingleImageTest(fileName, src); 
 
   //convert to grayscale
-  cvtColor(src, gray, CV_BGR2GRAY, 1); 
+  cvtColor(src, gray, COLOR_BGR2GRAY, 1); 
   Mat dstSW = Mat::zeros(gray.size(), CV_32FC1);
 
   if (numberOfIterations > 0) {

applicationCode/unitTests/testC++/testXfAccumulate/src/testSDxXfAccumulate.cpp

@@ -107,7 +107,7 @@ int main ( int argc, char** argv )
  	initializeSingleImageTest(fileName, src); 
 
   	//convert to grayscale
-  	cvtColor(src, gray, CV_BGR2GRAY, 1); 
+  	cvtColor(src, gray, COLOR_BGR2GRAY, 1); 
   	Mat dstSW = Mat::zeros(gray.size(), CV_32FC1);
 
 	int width = src.size().width;
@@ -118,7 +118,7 @@ int main ( int argc, char** argv )
 	xF::Mat dstHLS(height, width, CV_16UC1); //XF_16UC1 	
 
 	//convert 3-channel image into 1-channel image
-	cvtColor(src, srcHLS, CV_BGR2GRAY, 1);
+	cvtColor(src, srcHLS, COLOR_BGR2GRAY, 1);
 
 	// Apply OpenCV reference accumulate 
 	std::cout << "running golden model" << std::endl;
@@ -146,7 +146,7 @@ int main ( int argc, char** argv )
 	int numberOfDifferences = 0;
 	double errorPerPixel = 0;
 	imageCompare(dstHLS, dstSW, numberOfDifferences, errorPerPixel, true, false);
-	std::cout << "number of differences: " << numberOfDifferences << " average L2 error: " << errorPerPixel << std::endl;
+	std::cout << "number of differences: " << numberOfDifferences << " average L1 error: " << errorPerPixel << std::endl;
 
 	//write back images in files
 	if (writeSWResult)

applicationCode/unitTests/testC++/testXfAccumulateSquare/CMakeLists.txt

@@ -37,7 +37,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules/cmakeModulesXilinx ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules)
-include(rulesForSDxXfOpenCV)
+include(rulesForXfOpenCV)
 SET(componentName accumulateSquare)
 
 createXfOpenCVUnitTestPL("../../../.." ${componentName})

applicationCode/unitTests/testC++/testXfAccumulateSquare/src/goldenOpenCVAccumulateSquare.cpp

@@ -86,7 +86,7 @@ int main ( int argc, char** argv )
   initializeSingleImageTest(fileName, src); 
 
   //convert to grayscale
-  cvtColor(src, gray, CV_BGR2GRAY, 1); 
+  cvtColor(src, gray, COLOR_BGR2GRAY, 1); 
   Mat dstSW = Mat::zeros(gray.size(), CV_32FC1); 
 
   if (numberOfIterations > 0) {

applicationCode/unitTests/testC++/testXfAccumulateSquare/src/testSDxXfAccumulateSquare.cpp

@@ -107,7 +107,7 @@ int main ( int argc, char** argv )
  	initializeSingleImageTest(fileName, src); 
 
   	//convert to grayscale
-  	cvtColor(src, gray, CV_BGR2GRAY, 1); 
+  	cvtColor(src, gray, COLOR_BGR2GRAY, 1); 
   	Mat dstSW = Mat::zeros(gray.size(), CV_32FC1);
 
 	int width = src.size().width;
@@ -118,7 +118,7 @@ int main ( int argc, char** argv )
 	xF::Mat dstHLS(height, width, CV_16UC1); //XF_16UC1 	
 
 	//convert 3-channel image into 1-channel image
-	cvtColor(src, srcHLS, CV_BGR2GRAY, 1);
+	cvtColor(src, srcHLS, COLOR_BGR2GRAY, 1);
 
 	// Apply OpenCV reference accumulate 
 	std::cout << "running golden model" << std::endl;
@@ -146,7 +146,7 @@ int main ( int argc, char** argv )
 	int numberOfDifferences = 0;
 	double errorPerPixel = 0;
 	imageCompare(dstHLS, dstSW, numberOfDifferences, errorPerPixel, true, false);
-	std::cout << "number of differences: " << numberOfDifferences << " average L2 error: " << errorPerPixel << std::endl;
+	std::cout << "number of differences: " << numberOfDifferences << " average L1 error: " << errorPerPixel << std::endl;
 
 	//write back images in files
 	if (writeSWResult)

applicationCode/unitTests/testC++/testXfAccumulateWeighted/CMakeLists.txt

@@ -37,7 +37,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules/cmakeModulesXilinx ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules)
-include(rulesForSDxXfOpenCV)
+include(rulesForXfOpenCV)
 SET(componentName accumulateWeighted)
 
 createXfOpenCVUnitTestPL("../../../.." ${componentName})

applicationCode/unitTests/testC++/testXfAccumulateWeighted/src/goldenOpenCVAccumulateWeighted.cpp

@@ -81,12 +81,12 @@ int main ( int argc, char** argv )
 
   /// Declare variables
   Mat src, gray;
-  double alpha=0.2;
+  double alpha = 0.4;
   // Initialize
   initializeSingleImageTest(fileName, src); 
 
   //convert to grayscale
-  cvtColor(src, gray, CV_BGR2GRAY, 1); 
+  cvtColor(src, gray, COLOR_BGR2GRAY, 1); 
   Mat dstSW = Mat::zeros(gray.size(), CV_32FC1); 
 
   if (numberOfIterations > 0) {

applicationCode/unitTests/testC++/testXfAccumulateWeighted/src/testSDxXfAccumulateWeighted.cpp

@@ -107,7 +107,7 @@ int main ( int argc, char** argv )
  	initializeSingleImageTest(fileName, src); 
 
   	//convert to grayscale
-  	cvtColor(src, gray, CV_BGR2GRAY, 1); 
+  	cvtColor(src, gray, COLOR_BGR2GRAY, 1); 
   	Mat dstSW = Mat::zeros(gray.size(), CV_32FC1);
 
 	int width = src.size().width;
@@ -118,7 +118,7 @@ int main ( int argc, char** argv )
 	xF::Mat dstHLS(height, width, CV_16UC1); //XF_16UC1 	
 
 	//convert 3-channel image into 1-channel image
-	cvtColor(src, srcHLS, CV_BGR2GRAY, 1);
+	cvtColor(src, srcHLS, COLOR_BGR2GRAY, 1);
 
 	// Apply OpenCV reference accumulate 
 	std::cout << "running golden model" << std::endl;
@@ -146,7 +146,7 @@ int main ( int argc, char** argv )
 	int numberOfDifferences = 0;
 	double errorPerPixel = 0;
 	imageCompare(dstHLS, dstSW, numberOfDifferences, errorPerPixel, true, false);
-	std::cout << "number of differences: " << numberOfDifferences << " average L2 error: " << errorPerPixel << std::endl;
+	std::cout << "number of differences: " << numberOfDifferences << " average L1 error: " << errorPerPixel << std::endl;
 
 	//write back images in files
 	if (writeSWResult)

applicationCode/unitTests/testC++/testXfAdd/CMakeLists.txt

@@ -37,7 +37,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules/cmakeModulesXilinx ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules)
-include(rulesForSDxXfOpenCV)
+include(rulesForXfOpenCV)
 SET(componentName add)
 
 createXfOpenCVUnitTestPL("../../../.." ${componentName})

applicationCode/unitTests/testC++/testXfAdd/src/goldenOpenCVAdd.cpp

@@ -89,8 +89,8 @@ int main ( int argc, char** argv )
   initializeSingleImageTest(fileName1, src1);
   initializeSingleImageTest(fileName2, src2);
   //convert to grayscale
-  cvtColor(src1, gray1, CV_BGR2GRAY, 1);
-  cvtColor(src2, gray2, CV_BGR2GRAY, 1);
+  cvtColor(src1, gray1, COLOR_BGR2GRAY, 1);
+  cvtColor(src2, gray2, COLOR_BGR2GRAY, 1);
 
   if (numberOfIterations > 0) {
     HRTimer timer;

applicationCode/unitTests/testC++/testXfAdd/src/testSDxXfAdd.cpp

@@ -123,10 +123,12 @@ int main ( int argc, char** argv )
 	xF::Mat dstHLS(height, width, CV_8UC1);
 
 	//convert 3-channel image into 1-channel image
-	cvtColor(src1, src1HLS, CV_BGR2GRAY, 1);	
-	cvtColor(src2, src2HLS, CV_BGR2GRAY, 1);
-	cvtColor(src1, src1InY, CV_BGR2GRAY, 1);	
-	cvtColor(src2, src2InY, CV_BGR2GRAY, 1);
+	cvtColor(src1, src1InY, COLOR_BGR2GRAY, 1);	
+	cvtColor(src2, src2InY, COLOR_BGR2GRAY, 1);
+	//cvtColor(src1, src1HLS, COLOR_BGR2GRAY, 1);	
+	//cvtColor(src2, src2HLS, COLOR_BGR2GRAY, 1);
+	src1HLS.copyFromCvMat(src1InY);
+	src2HLS.copyFromCvMat(src2InY);
 
 	// Apply OpenCV reference subtract
 	std::cout << "running golden model" << std::endl;
@@ -152,7 +154,7 @@ int main ( int argc, char** argv )
 	int numberOfDifferences = 0;
 	double errorPerPixel = 0;
 	imageCompare(dstHLS, dstSW, numberOfDifferences, errorPerPixel, true, false);
-	std::cout << "number of differences: " << numberOfDifferences << " average L2 error: " << errorPerPixel << std::endl;
+	std::cout << "number of differences: " << numberOfDifferences << " average L1 error: " << errorPerPixel << std::endl;
 
 	//write back images in files
 	if (writeSWResult)

applicationCode/unitTests/testC++/testXfBitwise_and/CMakeLists.txt

@@ -37,7 +37,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules/cmakeModulesXilinx ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules)
-include(rulesForSDxXfOpenCV)
+include(rulesForXfOpenCV)
 SET(componentName bitwise_and)
 
 createXfOpenCVUnitTestPL("../../../.." ${componentName})

applicationCode/unitTests/testC++/testXfBitwise_and/src/goldenOpenCVBitwise_and.cpp

@@ -89,8 +89,8 @@ int main ( int argc, char** argv )
   initializeSingleImageTest(fileName1, src1);
   initializeSingleImageTest(fileName2, src2);
   //convert to grayscale
-  cvtColor(src1, gray1, CV_BGR2GRAY, 1);
-  cvtColor(src2, gray2, CV_BGR2GRAY, 1);
+  cvtColor(src1, gray1, COLOR_BGR2GRAY, 1);
+  cvtColor(src2, gray2, COLOR_BGR2GRAY, 1);
 
   if (numberOfIterations > 0) {
     HRTimer timer;

applicationCode/unitTests/testC++/testXfBitwise_and/src/testSDxXfBitwise_and.cpp

@@ -124,10 +124,10 @@ int main ( int argc, char** argv )
 	xF::Mat dstHLS(height, width, CV_8UC1);
 
 	//convert 3-channel image into 1-channel image
-	cvtColor(src1, src1HLS, CV_BGR2GRAY, 1);	
-	cvtColor(src2, src2HLS, CV_BGR2GRAY, 1);
-	cvtColor(src1, src1InY, CV_BGR2GRAY, 1);	
-	cvtColor(src2, src2InY, CV_BGR2GRAY, 1);
+	cvtColor(src1, src1HLS, COLOR_BGR2GRAY, 1);	
+	cvtColor(src2, src2HLS, COLOR_BGR2GRAY, 1);
+	cvtColor(src1, src1InY, COLOR_BGR2GRAY, 1);	
+	cvtColor(src2, src2InY, COLOR_BGR2GRAY, 1);
 
 	// Apply OpenCV reference threshold
 	std::cout << "running golden model" << std::endl;
@@ -153,7 +153,7 @@ int main ( int argc, char** argv )
 	int numberOfDifferences = 0;
 	double errorPerPixel = 0;
 	imageCompare(dstHLS, dstSW, numberOfDifferences, errorPerPixel, true, false);
-	std::cout << "number of differences: " << numberOfDifferences << " average L2 error: " << errorPerPixel << std::endl;
+	std::cout << "number of differences: " << numberOfDifferences << " average L1 error: " << errorPerPixel << std::endl;
 
 	//write back images in files
 	if (writeSWResult)

applicationCode/unitTests/testC++/testXfBitwise_not/CMakeLists.txt

@@ -37,7 +37,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules/cmakeModulesXilinx ${CMAKE_CURRENT_SOURCE_DIR}/../../../../frameworks/cmakeModules)
-include(rulesForSDxXfOpenCV)
+include(rulesForXfOpenCV)
 SET(componentName bitwise_not)
 
 createXfOpenCVUnitTestPL("../../../.." ${componentName})

applicationCode/unitTests/testC++/testXfBitwise_not/src/goldenOpenCVBitwise_not.cpp

@@ -86,7 +86,7 @@ int main ( int argc, char** argv )
   initializeSingleImageTest(fileName, src); 
 
   //convert to grayscale
-  cvtColor(src, gray, CV_BGR2GRAY, 1); 
+  cvtColor(src, gray, COLOR_BGR2GRAY, 1); 
 
   if (numberOfIterations > 0) {
     HRTimer timer;

applicationCode/unitTests/testC++/testXfBitwise_not/src/testSDxXfBitwise_not.cpp

@@ -120,8 +120,9 @@ int main ( int argc, char** argv )
 	xF::Mat dstHLS(height, width, CV_8UC1);
 
 	//convert 3-channel image into 1-channel image
-	cvtColor(src, srcHLS, CV_BGR2GRAY, 1); 
-	cvtColor(src, srcInY, CV_BGR2GRAY, 1); 
+	cvtColor(src, srcInY, COLOR_BGR2GRAY, 1);
+	cvtColor(src, srcHLS, COLOR_BGR2GRAY, 1);
+	//srcHLS.copyFromCvMat(srcInY);
 
 	// Apply OpenCV reference threshold
 	std::cout << "running golden model" << std::endl;
@@ -146,7 +147,7 @@ int main ( int argc, char** argv )
 	int numberOfDifferences = 0;
 	double errorPerPixel = 0;
 	imageCompare(dstHLS, dstSW, numberOfDifferences, errorPerPixel, true, false);
-	std::cout << "number of differences: " << numberOfDifferences << " average L2 error: " << errorPerPixel << std::endl;
+	std::cout << "number of differences: " << numberOfDifferences << " average L1 error: " << errorPerPixel << std::endl;
 
 	//write back images in files
 	if (writeSWResult)