V1.7.0.0

3rdparty/sharpcompress-0.11/README.md

@@ -0,0 +1 @@
+libraries are built against this [tag version](https://github.com/adamhathcock/sharpcompress/tree/0.11)

AMDOpenCLDeviceDetection/AMDOpenCLDeviceDetection.cpp

@@ -57,46 +57,52 @@ bool AMDOpenCLDeviceDetection::QueryDevices() {
 		else {
 			for (auto i_pId = 0u; i_pId < platforms.size(); ++i_pId) {
 				string platformName = StringnNullTerminatorFix(platforms[i_pId].getInfo<CL_PLATFORM_NAME>());
-				_platformNumbers.emplace(make_pair(platformName, i_pId));
-				// not the best way but it should work
-				bool isAMD = platformName.find("AMD", 0) != string::npos;
-				vector<OpenCLDevice> platformDevs;
-				auto clDevs = getDevices(platforms, i_pId);
-				for (auto i_devId = 0u; i_devId < clDevs.size(); ++i_devId) {
-					OpenCLDevice curDevice;
-					curDevice.DeviceID = i_devId;
-					curDevice._CL_DEVICE_NAME = StringnNullTerminatorFix(clDevs[i_devId].getInfo<CL_DEVICE_NAME>());
-					switch (clDevs[i_devId].getInfo<CL_DEVICE_TYPE>()) {
-					case CL_DEVICE_TYPE_CPU:
-						curDevice._CL_DEVICE_TYPE = "CPU";
-						break;
-					case CL_DEVICE_TYPE_GPU:
-						curDevice._CL_DEVICE_TYPE = "GPU";
-						break;
-					case CL_DEVICE_TYPE_ACCELERATOR:
-						curDevice._CL_DEVICE_TYPE = "ACCELERATOR";
-						break;
-					default:
-						curDevice._CL_DEVICE_TYPE = "DEFAULT";
-						break;
-					}
-
-					curDevice._CL_DEVICE_GLOBAL_MEM_SIZE = clDevs[i_devId].getInfo<CL_DEVICE_GLOBAL_MEM_SIZE>();
-					curDevice._CL_DEVICE_VENDOR = StringnNullTerminatorFix(clDevs[i_devId].getInfo<CL_DEVICE_VENDOR>());
-					curDevice._CL_DEVICE_VERSION = StringnNullTerminatorFix(clDevs[i_devId].getInfo<CL_DEVICE_VERSION>());
-					curDevice._CL_DRIVER_VERSION = StringnNullTerminatorFix(clDevs[i_devId].getInfo<CL_DRIVER_VERSION>());
+				if (std::find(_platformNames.begin(), _platformNames.end(), platformName) == _platformNames.end()) {
+					JsonLog current;
+					_platformNames.push_back(platformName);
+					// new
+					current.PlatformName = platformName;
+					current.PlatformNum = i_pId;
+
+					// not the best way but it should work
+					bool isAMD = platformName.find("AMD", 0) != string::npos;
+					auto clDevs = getDevices(platforms, i_pId);
+					for (auto i_devId = 0u; i_devId < clDevs.size(); ++i_devId) {
+						OpenCLDevice curDevice;
+						curDevice.DeviceID = i_devId;
+						curDevice._CL_DEVICE_NAME = StringnNullTerminatorFix(clDevs[i_devId].getInfo<CL_DEVICE_NAME>());
+						switch (clDevs[i_devId].getInfo<CL_DEVICE_TYPE>()) {
+						case CL_DEVICE_TYPE_CPU:
+							curDevice._CL_DEVICE_TYPE = "CPU";
+							break;
+						case CL_DEVICE_TYPE_GPU:
+							curDevice._CL_DEVICE_TYPE = "GPU";
+							break;
+						case CL_DEVICE_TYPE_ACCELERATOR:
+							curDevice._CL_DEVICE_TYPE = "ACCELERATOR";
+							break;
+						default:
+							curDevice._CL_DEVICE_TYPE = "DEFAULT";
+							break;
+						}
 
-					// AMD topology get Bus No
-					if (isAMD) {
-						cl_device_topology_amd topology = clDevs[i_devId].getInfo<CL_DEVICE_TOPOLOGY_AMD>();
-						if (topology.raw.type == CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD) {
-							curDevice.AMD_BUS_ID = (int)topology.pcie.bus;
+						curDevice._CL_DEVICE_GLOBAL_MEM_SIZE = clDevs[i_devId].getInfo<CL_DEVICE_GLOBAL_MEM_SIZE>();
+						curDevice._CL_DEVICE_VENDOR = StringnNullTerminatorFix(clDevs[i_devId].getInfo<CL_DEVICE_VENDOR>());
+						curDevice._CL_DEVICE_VERSION = StringnNullTerminatorFix(clDevs[i_devId].getInfo<CL_DEVICE_VERSION>());
+						curDevice._CL_DRIVER_VERSION = StringnNullTerminatorFix(clDevs[i_devId].getInfo<CL_DRIVER_VERSION>());
+
+						// AMD topology get Bus No
+						if (isAMD) {
+							cl_device_topology_amd topology = clDevs[i_devId].getInfo<CL_DEVICE_TOPOLOGY_AMD>();
+							if (topology.raw.type == CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD) {
+								curDevice.AMD_BUS_ID = (int)topology.pcie.bus;
+							}
 						}
-					}
 
-					platformDevs.push_back(curDevice);
+						current.Devices.push_back(curDevice);
+					}
+					_devicesPlatformsDevices.push_back(current);
 				}
-				_devicesPerPlatform.emplace(make_pair(platformName, platformDevs));
 			}
 		}
 	}
@@ -113,28 +119,18 @@ bool AMDOpenCLDeviceDetection::QueryDevices() {
 
 // this function is hardcoded and horrable
 void AMDOpenCLDeviceDetection::PrintDevicesJson() {
-	cout << "{" << endl;
+	cout << "[" << endl;
 
-	// platforms array scope
 	{
-		cout << "\t\"OCLPlatforms\" : {" << endl;
-		int platformsComma = _platformNumbers.size();
-		for (const auto &plat_name_num : _platformNumbers) {
-			cout << "\t\t\"" + plat_name_num.first + "\" : "
-				<< plat_name_num.second << COMMA(platformsComma)
-				<< endl;
-		}
-		cout << "\t}," << endl;
-	}
-	// device per platform array scope
-	{
-		int devPlatformsComma = _devicesPerPlatform.size();
-		cout << "\t\"OCLPlatformDevices\" : {" << endl;
-		for (const auto &plat_name_devs : _devicesPerPlatform) {
-			cout << "\t\t\"" + plat_name_devs.first + "\" : [" << endl;
+		int devPlatformsComma = _devicesPlatformsDevices.size();
+		for (const auto &jsonLog : _devicesPlatformsDevices) {
+			cout << "\t{" << endl;
+			cout << "\t\t\"PlatformName\": \"" << jsonLog.PlatformName << "\"" << "," << endl;
+			cout << "\t\t\"PlatformNum\": " << jsonLog.PlatformNum << "," << endl;
+			cout << "\t\t\"Devices\" : [" << endl;
 			// device print
-			int devComma = plat_name_devs.second.size();
-			for (const auto &dev : plat_name_devs.second) {
+			int devComma = jsonLog.Devices.size();
+			for (const auto &dev : jsonLog.Devices) {
 				cout << "\t\t\t{" << endl;
 				cout << "\t\t\t\t\"" << "DeviceID" << "\" : " << dev.DeviceID << "," << endl; // num
 				cout << "\t\t\t\t\"" << "AMD_BUS_ID" << "\" : " << dev.AMD_BUS_ID << "," << endl; // num
@@ -146,10 +142,43 @@ void AMDOpenCLDeviceDetection::PrintDevicesJson() {
 				cout << "\t\t\t\t\"" << "_CL_DRIVER_VERSION" << "\" : \"" << dev._CL_DRIVER_VERSION << "\"" << endl;
 				cout << "\t\t\t}" << COMMA(devComma) << endl;
 			}
-			cout << "\t\t]" << COMMA(devPlatformsComma) << endl;
+			cout << "\t\t]" << endl;
+			cout << "\t}" << COMMA(devPlatformsComma) << endl;
 		}
-		cout << "\t}" << endl;
 	}
 
-	cout << "}" << endl;
-}
+	cout << "]" << endl;
+}
+
+
+void AMDOpenCLDeviceDetection::PrintDevicesJsonDirty() {
+	cout << "[";
+
+	{
+		int devPlatformsComma = _devicesPlatformsDevices.size();
+		for (const auto &jsonLog : _devicesPlatformsDevices) {
+			cout << "{";
+			cout << "\"PlatformName\": \"" << jsonLog.PlatformName << "\"" << ",";
+			cout << "\"PlatformNum\": " << jsonLog.PlatformNum << ",";
+			cout << "\"Devices\" : [";
+			// device print
+			int devComma = jsonLog.Devices.size();
+			for (const auto &dev : jsonLog.Devices) {
+				cout << "{";
+				cout << "\"" << "DeviceID" << "\" : " << dev.DeviceID << ","; // num
+				cout << "\"" << "AMD_BUS_ID" << "\" : " << dev.AMD_BUS_ID << ","; // num
+				cout << "\"" << "_CL_DEVICE_NAME" << "\" : \"" << dev._CL_DEVICE_NAME << "\",";
+				cout << "\"" << "_CL_DEVICE_TYPE" << "\" : \"" << dev._CL_DEVICE_TYPE << "\",";
+				cout << "\"" << "_CL_DEVICE_GLOBAL_MEM_SIZE" << "\" : " << dev._CL_DEVICE_GLOBAL_MEM_SIZE << ","; // num
+				cout << "\"" << "_CL_DEVICE_VENDOR" << "\" : \"" << dev._CL_DEVICE_VENDOR << "\",";
+				cout << "\"" << "_CL_DEVICE_VERSION" << "\" : \"" << dev._CL_DEVICE_VERSION << "\",";
+				cout << "\"" << "_CL_DRIVER_VERSION" << "\" : \"" << dev._CL_DRIVER_VERSION << "\"";
+				cout << "}" << COMMA(devComma);
+			}
+			cout << "]";
+			cout << "}" << COMMA(devPlatformsComma);
+		}
+	}
+
+	cout << "]" << endl;
+}

AMDOpenCLDeviceDetection/AMDOpenCLDeviceDetection.h

@@ -2,6 +2,8 @@
 
 #define __CL_ENABLE_EXCEPTIONS
 #define CL_USE_DEPRECATED_OPENCL_2_0_APIS
+#define CL_VERSION_1_2
+//#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
 
 #include "cl_ext.hpp"
 
@@ -12,21 +14,28 @@
 
 #include "OpenCLDevice.h"
 
+struct JsonLog {
+	std::string PlatformName;
+	int PlatformNum;
+	std::vector<OpenCLDevice> Devices;
+};
+
 class AMDOpenCLDeviceDetection {
 public:
 	AMDOpenCLDeviceDetection();
 	~AMDOpenCLDeviceDetection();
 
 	bool QueryDevices();
 	void PrintDevicesJson();
+	void PrintDevicesJsonDirty();
 
 private:
 
 	static std::vector<cl::Device> getDevices(std::vector<cl::Platform> const& _platforms, unsigned _platformId);
 	static std::vector<cl::Platform> getPlatforms();
 
-	std::map<std::string, std::vector<OpenCLDevice>> _devicesPerPlatform;
-	std::map<std::string, int> _platformNumbers;
+	std::vector<std::string> _platformNames;
+	std::vector<JsonLog> _devicesPlatformsDevices;
 
 	static std::string StringnNullTerminatorFix(const std::string& str);
 };

AMDOpenCLDeviceDetection/AMDOpenCLDeviceDetection.vcxproj

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -22,31 +30,56 @@
     <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -67,6 +100,29 @@
       <Command>copy /Y "$(AMDAPPSDKROOT)\bin\x86_64\OpenCL.dll" "$(SolutionDir)$(Configuration)\OpenCL.dll"
 REM the path is absolute maybe fix
 copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcp120.dll" "$(SolutionDir)$(Configuration)\msvcp120.dll"
+copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" "$(SolutionDir)$(Configuration)\msvcr120.dll"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>.;$(AMDAPPSDKROOT)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>OpenCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(AMDAPPSDKROOT)\lib\x86\</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y "$(AMDAPPSDKROOT)\bin\x86_64\OpenCL.dll" "$(SolutionDir)$(Configuration)\OpenCL.dll"
+REM the path is absolute maybe fix
+copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcp120.dll" "$(SolutionDir)$(Configuration)\msvcp120.dll"
 copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" "$(SolutionDir)$(Configuration)\msvcr120.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -94,6 +150,33 @@ copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Micro
       <Command>copy /Y "$(AMDAPPSDKROOT)\bin\x86_64\OpenCL.dll" "$(SolutionDir)$(Configuration)\OpenCL.dll"
 REM the path is absolute maybe fix
 copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcp120.dll" "$(SolutionDir)$(Configuration)\msvcp120.dll"
+copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" "$(SolutionDir)$(Configuration)\msvcr120.dll"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>.;$(AMDAPPSDKROOT)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(AMDAPPSDKROOT)\lib\x86\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>OpenCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y "$(AMDAPPSDKROOT)\bin\x86_64\OpenCL.dll" "$(SolutionDir)$(Configuration)\OpenCL.dll"
+REM the path is absolute maybe fix
+copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcp120.dll" "$(SolutionDir)$(Configuration)\msvcp120.dll"
 copy /Y "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" "$(SolutionDir)$(Configuration)\msvcr120.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>

AMDOpenCLDeviceDetection/main.cpp

@@ -1,9 +1,14 @@
 #include "AMDOpenCLDeviceDetection.h"
 
-int main() {
+int main(int argc, char* argv[]) {
 	AMDOpenCLDeviceDetection AMDOpenCLDeviceDetection;
 	if (AMDOpenCLDeviceDetection.QueryDevices()) {
-		AMDOpenCLDeviceDetection.PrintDevicesJson();
+		if (argc < 2) {
+			AMDOpenCLDeviceDetection.PrintDevicesJsonDirty();
+		}
+		else {
+			AMDOpenCLDeviceDetection.PrintDevicesJson();
+		}
 	}
 	return 0;
 }