Fixes to old windows build method.

jrk · Dec 3, 2013 · f3e62a4 · f3e62a4
1 parent d887fb3
commit f3e62a4
Show file tree

Hide file tree

Showing 99 changed files with 820 additions and 12 deletions.
diff --git a/msvc/Halide.vcxproj b/msvc/Halide.vcxproj
@@ -181,7 +181,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;WITH_X86=1;WITH_ARM=1;_DEBUG;_WINDOWS;_WINDOWS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;WITH_X86=1;WITH_ARM=1;Halide_SHARED=1;Halide_EXPORTS=1;_DEBUG;_WINDOWS;_WINDOWS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -217,7 +217,7 @@ cd $(SolutionDir)</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;WITH_X86=1;WITH_ARM=1;_DEBUG;_WINDOWS;_WINDOWS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;WITH_X86=1;WITH_ARM=1;Halide_SHARED=1;Halide_EXPORTS=1;_DEBUG;_WINDOWS;_WINDOWS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -335,7 +335,7 @@ cd $(SolutionDir)</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;WITH_X86=1;WITH_ARM=1;NDEBUG;_WINDOWS;_WINDOWS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;WITH_X86=1;WITH_ARM=1;Halide_SHARED=1;Halide_EXPORTS=1;NDEBUG;_WINDOWS;_WINDOWS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -372,7 +372,7 @@ cd $(SolutionDir)</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;WITH_X86=1;WITH_ARM=1;NDEBUG;_WINDOWS;_WINDOWS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;WITH_X86=1;WITH_ARM=1;Halide_SHARED=1;Halide_EXPORTS=1;NDEBUG;_WINDOWS;_WINDOWS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -503,6 +503,7 @@ cd $(SolutionDir)</Command>
     <ClCompile Include="..\src\CodeGen_OpenCL_Dev.cpp" />
     <ClCompile Include="..\src\CodeGen_Posix.cpp" />
     <ClCompile Include="..\src\CodeGen_PTX_Dev.cpp" />
+    <ClCompile Include="..\src\CodeGen_SPIR_Dev.cpp" />
     <ClCompile Include="..\src\CodeGen_X86.cpp" />
     <ClCompile Include="..\src\CSE.cpp" />
     <ClCompile Include="..\src\Debug.cpp" />
@@ -532,7 +533,9 @@ cd $(SolutionDir)</Command>
     <ClCompile Include="..\src\Reduction.cpp" />
     <ClCompile Include="..\src\RemoveTrivialForLoops.cpp" />
     <ClCompile Include="..\src\Simplify.cpp" />
+    <ClCompile Include="..\src\SkipStages.cpp" />
     <ClCompile Include="..\src\SlidingWindow.cpp" />
+    <ClCompile Include="..\src\SpecializeClampedRamps.cpp" />
     <ClCompile Include="..\src\StmtCompiler.cpp" />
     <ClCompile Include="..\src\StorageFlattening.cpp" />
     <ClCompile Include="..\src\StorageFolding.cpp" />
@@ -562,6 +565,7 @@ cd $(SolutionDir)</Command>
     <ClInclude Include="..\src\CodeGen_OpenCL_Dev.h" />
     <ClInclude Include="..\src\CodeGen_Posix.h" />
     <ClInclude Include="..\src\CodeGen_PTX_Dev.h" />
+    <ClInclude Include="..\src\CodeGen_SPIR_Dev.h" />
     <ClInclude Include="..\src\CodeGen_X86.h" />
     <ClInclude Include="..\src\CSE.h" />
     <ClInclude Include="..\src\Debug.h" />
@@ -600,7 +604,9 @@ cd $(SolutionDir)</Command>
     <ClInclude Include="..\src\Schedule.h" />
     <ClInclude Include="..\src\Scope.h" />
     <ClInclude Include="..\src\Simplify.h" />
+    <ClInclude Include="..\src\SkipStages.h" />
     <ClInclude Include="..\src\SlidingWindow.h" />
+    <ClInclude Include="..\src\SpecializeClampedRamps.h" />
     <ClInclude Include="..\src\StmtCompiler.h" />
     <ClInclude Include="..\src\StorageFlattening.h" />
     <ClInclude Include="..\src\StorageFolding.h" />

diff --git a/msvc/Halide.vcxproj.filters b/msvc/Halide.vcxproj.filters
@@ -177,6 +177,15 @@
     <ClCompile Include="initmod.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\SkipStages.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\SpecializeClampedRamps.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\CodeGen_SPIR_Dev.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\Bounds.h">
@@ -377,5 +386,14 @@
     <ClInclude Include="..\src\VectorizeLoops.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\SkipStages.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\SpecializeClampedRamps.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\CodeGen_SPIR_Dev.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/msvc/tests/run_all_tests.bat b/msvc/tests/run_all_tests.bat
@@ -22,6 +22,9 @@ if not errorlevel 0 exit 1
 echo Running test bitwise_ops
 test_bitwise_ops.exe
 if not errorlevel 0 exit 1
+echo Running test bit_counting
+test_bit_counting.exe
+if not errorlevel 0 exit 1
 echo Running test bound
 test_bound.exe
 if not errorlevel 0 exit 1
@@ -37,6 +40,9 @@ if not errorlevel 0 exit 1
 echo Running test bounds_inference_complex
 test_bounds_inference_complex.exe
 if not errorlevel 0 exit 1
+echo Running test bounds_of_abs
+test_bounds_of_abs.exe
+if not errorlevel 0 exit 1
 echo Running test bounds_of_cast
 test_bounds_of_cast.exe
 if not errorlevel 0 exit 1
@@ -124,6 +130,9 @@ if not errorlevel 0 exit 1
 echo Running test gpu_large_alloc
 test_gpu_large_alloc.exe
 if not errorlevel 0 exit 1
+echo Running test gpu_multi_kernel
+test_gpu_multi_kernel.exe
+if not errorlevel 0 exit 1
 echo Running test handle
 test_handle.exe
 if not errorlevel 0 exit 1
@@ -160,6 +169,9 @@ if not errorlevel 0 exit 1
 echo Running test lambda
 test_lambda.exe
 if not errorlevel 0 exit 1
+echo Running test lazy_convolution
+test_lazy_convolution.exe
+if not errorlevel 0 exit 1
 echo Running test lerp
 test_lerp.exe
 if not errorlevel 0 exit 1
@@ -172,6 +184,9 @@ if not errorlevel 0 exit 1
 echo Running test many_dimensions
 test_many_dimensions.exe
 if not errorlevel 0 exit 1
+echo Running test math
+test_math.exe
+if not errorlevel 0 exit 1
 echo Running test mod
 test_mod.exe
 if not errorlevel 0 exit 1
@@ -181,6 +196,9 @@ if not errorlevel 0 exit 1
 echo Running test multi_output_pipeline_with_bad_sizes
 test_multi_output_pipeline_with_bad_sizes.exe
 if not errorlevel 0 exit 1
+echo Running test multi_pass_reduction
+test_multi_pass_reduction.exe
+if not errorlevel 0 exit 1
 echo Running test newtons_method
 test_newtons_method.exe
 if not errorlevel 0 exit 1
@@ -214,6 +232,9 @@ if not errorlevel 0 exit 1
 echo Running test partial_application
 test_partial_application.exe
 if not errorlevel 0 exit 1
+echo Running test process_some_tiles
+test_process_some_tiles.exe
+if not errorlevel 0 exit 1
 echo Running test realize_over_shifted_domain
 test_realize_over_shifted_domain.exe
 if not errorlevel 0 exit 1
@@ -235,6 +256,9 @@ if not errorlevel 0 exit 1
 echo Running test side_effects
 test_side_effects.exe
 if not errorlevel 0 exit 1
+echo Running test skip_stages
+test_skip_stages.exe
+if not errorlevel 0 exit 1
 echo Running test sliding_backwards
 test_sliding_backwards.exe
 if not errorlevel 0 exit 1

diff --git a/msvc/tests/template.vcxproj b/msvc/tests/template.vcxproj
@@ -156,6 +156,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -167,6 +168,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -178,6 +180,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -189,6 +192,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -202,6 +206,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -217,6 +222,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -232,6 +238,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -247,6 +254,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/msvc/tests/test_argmax.vcxproj b/msvc/tests/test_argmax.vcxproj
@@ -156,6 +156,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -167,6 +168,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -178,6 +180,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -189,6 +192,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -202,6 +206,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -217,6 +222,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -232,6 +238,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -247,6 +254,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/msvc/tests/test_assertion_failure_in_parallel_for.vcxproj b/msvc/tests/test_assertion_failure_in_parallel_for.vcxproj
@@ -156,6 +156,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -167,6 +168,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -178,6 +180,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -189,6 +192,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -202,6 +206,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -217,6 +222,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -232,6 +238,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -247,6 +254,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>Halide_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>