added win vs17 proj

mrtuborg · Nov 18, 2018 · 24588c9 · 24588c9
1 parent 7e13cc1
commit 24588c9
Show file tree

Hide file tree

Showing 14 changed files with 636 additions and 18 deletions.
diff --git a/algebra/FFT/FFT.vcxproj b/algebra/FFT/FFT.vcxproj
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\Basis.cpp" />
+    <ClCompile Include="src\Definitions.cpp" />
+    <ClCompile Include="src\Element.cpp" />
+    <ClCompile Include="src\FFT.cpp" />
+    <ClCompile Include="src\Polynomials.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\Basis.h" />
+    <ClInclude Include="src\Definitions.h" />
+    <ClInclude Include="src\Element.h" />
+    <ClInclude Include="src\FFT.h" />
+    <ClInclude Include="src\Polynomials.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="src\Chunk.cu" />
+    <None Include="src\Chunk.cuh" />
+    <None Include="src\FFT.cu" />
+    <None Include="src\GPU_FFT.cu" />
+    <None Include="src\GPU_FFT.cuh" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6437B53C-7A17-472F-99AC-412FFCC147CD}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>FFT</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <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)'=='Release|x64'" 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'">
+    <OutDir>$(SolutionDir)\algebra\$(ProjectName)\$(Configuration)\$(Platform)</OutDir>
+    <IntDir>$(SolutionDir)\algebra\$(ProjectName)\$(Configuration)\$(Platform)\build\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)\algebra\$(ProjectName)\$(Configuration)\$(Platform)</OutDir>
+    <IntDir>$(SolutionDir)\algebra\$(ProjectName)\$(Configuration)\$(Platform)\build\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir)</AdditionalIncludeDirectories>
+      <OpenMPSupport>true</OpenMPSupport>
+      <AdditionalOptions>/D SCIPR_NUM_THREADS=1 %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <CudaCompile>
+      <Runtime>MTd</Runtime>
+      <CodeGeneration>compute_30,sm_30;compute_35,sm_35;compute_37,sm_37;compute_50,sm_50;</CodeGeneration>
+      <TargetMachinePlatform>64</TargetMachinePlatform>
+      <Defines>WIN32</Defines>
+    </CudaCompile>
+    <Lib>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>OLD_OPENMP;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_LIB;SCIPR_NUM_THREADS=16;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir)</AdditionalIncludeDirectories>
+      <OpenMPSupport>true</OpenMPSupport>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <CudaCompile>
+      <TargetMachinePlatform>64</TargetMachinePlatform>
+      <Defines>WIN32</Defines>
+      <CodeGeneration>compute_30,sm_30;compute_35,sm_35;compute_37,sm_37;compute_50,sm_50;</CodeGeneration>
+    </CudaCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>
diff --git a/algebra/FFT/src/Definitions.h b/algebra/FFT/src/Definitions.h
@@ -12,6 +12,14 @@
 //#define __GPU
 //#define __MEASURE
 
+#ifdef OLD_OPENMP
+typedef long long plooplongtype;
+typedef int ploopinttype;
+#else
+typedef unsigned long long plooplongtype;
+typedef unsigned int ploopinttype;
+#endif
+
 namespace FFF {
 
 	/**** typedef *****/

diff --git a/algebra/FFT/src/Element.cpp b/algebra/FFT/src/Element.cpp
@@ -9,8 +9,8 @@
  */
 
 #ifdef WIN32
-//#include <wmmintrin.h>
-#include <emmintrin.h>
+#include <wmmintrin.h>
+//#include <emmintrin.h>
 #endif	// #ifdef WIN32
 #ifdef __GNUC__
 #include <x86intrin.h>

diff --git a/algebra/FFT/src/FFT.cpp b/algebra/FFT/src/FFT.cpp
@@ -470,7 +470,7 @@ void FFT::AlgIFFT(Element* P){
             const size_t step = 1UL << (size - min_log_general_level);
             const size_t bound = 1UL<<size;
 #pragma omp parallel for
-			for (unsigned long long i = 0; i < bound; i+=step){
+			for (plooplongtype i = 0; i < bound; i+=step){
 				FFT::ifft_serial(P+i,size-min_log_general_level,c_p_cpy_local+i);
 			}
 		}
@@ -576,7 +576,7 @@ void FFT::AlgIFFT(Element* P){
             const size_t step = 1UL << (size - min_log_general_levels);
             const size_t bound = 1UL<<size;
 #pragma omp parallel for
-			for (unsigned long long i = 0; i < bound; i += step){
+			for (plooplongtype i = 0; i < bound; i += step){
 				FFT::fft_serial(p_cpy+i,size-min_log_general_levels,it+i);
 			}
 		}
@@ -597,7 +597,7 @@ void FFT::AlgIFFT(Element* P){
         free(c_p_cpy_local);
 		if(min_log_general_levels > size-1){
 #pragma omp parallel for schedule(static,(1UL<<(size-1))/omp_max_threads)//MAX
-			for (unsigned long long i = 1; i <= (1UL << size); i += 2){
+			for (plooplongtype i = 1; i <= (1UL << size); i += 2){
 				Element::c_mulXor(P[i],lastShift,P[i-1]);
 				Element::c_mul(P[i],lastD,P[i]);
 				Element::c_add(P[i],P[i-1],P[i]);

diff --git a/algebra/algebralib/algebraLib.vcxproj b/algebra/algebralib/algebraLib.vcxproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{05E67B97-D96F-4015-ACB2-9D0BFF3D6C89}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>algebraLib</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(VC_IncludePath)\headers;$(WindowsSDK_IncludePath);</IncludePath>
+    <SourcePath>$(VC_SourcePath)\src;$(VC_SourcePath)\tests;</SourcePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <SourcePath>$(VC_SourcePath)\src;$(VC_SourcePath)\tests;</SourcePath>
+    <OutDir>$(SolutionDir)\algebra\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)\algebra\$(ProjectName)\$(Configuration)\$(Platform)\build\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)\algebra\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)\algebra\$(ProjectName)\$(Configuration)\$(Platform)\build\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);SCIPR_NUM_THREADS=1</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\algebra\FFT\src;$(ProjectDir)\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <SDLCheck>true</SDLCheck>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </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;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;SCIPR_NUM_THREADS=16;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Visual Leak Detector\include;$(SolutionDir)\algebra\FFT\src;$(ProjectDir)\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\AffinePolynomial.cpp" />
+    <ClCompile Include="src\AffineSpace.cpp" />
+    <ClCompile Include="src\BitExtract.cpp" />
+    <ClCompile Include="src\CircuitPolynomial.cpp" />
+    <ClCompile Include="src\ErrorHandling.cpp" />
+    <ClCompile Include="src\FFT.cpp" />
+    <ClCompile Include="src\FieldElement.cpp" />
+    <ClCompile Include="src\LinearPolynomial.cpp" />
+    <ClCompile Include="src\novelFFT.cpp" />
+    <ClCompile Include="src\MappingsSys.cpp" />
+    <ClCompile Include="src\PolynomialDegree.cpp" />
+    <ClCompile Include="src\SelectorSum.cpp" />
+    <ClCompile Include="src\SubspacePolynomial.cpp" />
+    <ClCompile Include="src\UnivariatePolynomialGeneral.cpp" />
+    <ClCompile Include="src\variable.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="headers\algebraLib\AffinePolynomial.hpp" />
+    <ClInclude Include="headers\algebraLib\AffineSpace.hpp" />
+    <ClInclude Include="headers\algebraLib\BitExtract.hpp" />
+    <ClInclude Include="headers\algebraLib\CircuitPolynomial.hpp" />
+    <ClInclude Include="headers\algebraLib\ErrorHandling.hpp" />
+    <ClInclude Include="headers\algebraLib\FFT.hpp" />
+    <ClInclude Include="headers\algebraLib\FieldElement.hpp" />
+    <ClInclude Include="headers\algebraLib\LinearPolynomial.hpp" />
+    <ClInclude Include="headers\algebraLib\LinearizedPolynomial.hpp" />
+    <ClInclude Include="headers\algebraLib\novelFFT.hpp" />
+    <ClInclude Include="headers\algebraLib\nMappingsSys.hpp" />
+    <ClInclude Include="headers\algebraLib\PolynomialDegree.hpp" />
+    <ClInclude Include="headers\algebraLib\PolynomialInterface.hpp" />
+    <ClInclude Include="headers\algebraLib\SelectorSum.hpp" />
+    <ClInclude Include="headers\algebraLib\SubspacePolynomial.hpp" />
+    <ClInclude Include="headers\algebraLib\UnivariatePolynomialGeneral.hpp" />
+    <ClInclude Include="headers\algebraLib\variable.hpp" />
+    <ClInclude Include="headers\algebraLib\variable_operators.hpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>