#ifndef __OPENCV_VERSION_HPP__
#define __OPENCV_VERSION_HPP__
- #define CV_MAJOR_VERSION 2
- #define CV_MINOR_VERSION 4
- #define CV_SUBMINOR_VERSION 9
+ #define CV_VERSION_EPOCH 2
+ #define CV_VERSION_MAJOR 4
-#define CV_VERSION_MINOR 3
-#define CV_VERSION_REVISION 2
++#define CV_VERSION_MINOR 9
++#define CV_VERSION_REVISION 0
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
}
}
- #if _MSC_VER >= 1200
- #pragma warning( push)
- #pragma warning( disable: 4267)
+ #if defined _MSC_VER && _MSC_VER >= 1200
+ # pragma warning( push)
+ # pragma warning( disable: 4267)
#endif
#include "opencv2/ocl/matrix_operations.hpp"
- #if _MSC_VER >= 1200
- #pragma warning( pop)
+ #if defined _MSC_VER && _MSC_VER >= 1200
+ # pragma warning( pop)
#endif
-#endif /* __OPENCV_GPU_HPP__ */
+
+#endif /* __OPENCV_OCL_HPP__ */
TS::ptr()->init("ocl");
InitGoogleTest(&argc, argv);
const char *keys =
-
- "{ h | help | false | print help message }"
-
- "{ w | workdir | ../../../samples/c/| set working directory }"
-
- "{ t | type | gpu | set device type:cpu or gpu}"
-
- "{ p | platform | 0 | set platform id }"
-
- "{ d | device | 0 | set device id }";
-
-
+ "{ h | false | print help message }"
+ "{ w | ../../../samples/c/| set working directory i.e. -w=C:\\}"
+ "{ t | gpu | set device type:i.e. -t=cpu or gpu}"
+ "{ p | 0 | set platform id i.e. -p=0}"
+ "{ d | 0 | set device id i.e. -d=0}";
CommandLineParser cmd(argc, argv, keys);
-
- if (cmd.get<bool>("help"))
-
+ if (cmd.get<string>("h")=="true")
{
-
cout << "Avaible options besides goole test option:" << endl;
-
- cmd.printParams();
+ cmd.printMessage();
+ return 0;
}
-
- workdir = cmd.get<string>("workdir");
-
- string type = cmd.get<string>("type");
-
- unsigned int pid = cmd.get<unsigned int>("platform");
-
- int device = cmd.get<int>("device");
-
-
+ workdir = cmd.get<string>("w");
+ string type = cmd.get<string>("t");
+ unsigned int pid = cmd.get<unsigned int>("p");
+ int device = cmd.get<int>("d");
print_info();
- int flag = CVCL_DEVICE_TYPE_GPU;
+ // int flag = CVCL_DEVICE_TYPE_GPU;
- if(type == "cpu")
- {
- flag = CVCL_DEVICE_TYPE_CPU;
- }
+ // if(type == "cpu")
-
+ // {
-
+ // flag = CVCL_DEVICE_TYPE_CPU;
-
+ // }
std::vector<cv::ocl::Info> oclinfo;
int devnums = getDevice(oclinfo);
if(devnums <= device || device < 0)