Built with MKL FastMat

Author: hzyereba

.gitignore

@@ -0,0 +1,25 @@
+/UncollapsedSampler/x64/Debug/*.obj
+/UncollapsedSampler/x64/Debug/Uncollap.4BD86494.tlog/*.tlog
+/UncollapsedSampler/x64/Debug/*.log
+/UncollapsedSampler/x64/Debug/*.cache
+/UncollapsedSampler/x64/Release/*.obj
+/UncollapsedSampler/x64/Release/*.sbr
+/UncollapsedSampler/x64/Release/Uncollap.4BD86494.tlog/*.tlog
+/UncollapsedSampler/x64/Release/Uncollap.4BD86494.tlog/*.lastbuildstate
+/UncollapsedSampler/x64/Release/*.log
+/UncollapsedSampler/x64/Release/*.cache
+/UncollapsedSampler/x64/Release/*.pdb
+/*.labels
+/*.likelihood
+/*.rest
+/run/experiments/mnist/*.matrix
+/run/experiments/mnist/*.labels
+/run/experiments/parallel/*.matrix
+/run/experiments/parallel/*.labels
+/run/experiments/parallel/*.likelihood
+/run/experiments/parallel/coords_ryan/plots/*.eps
+/run/experiments/parallel/*.rest
+/run/experiments/parallel/*.bin
+/run/experiments/parallel/*.log
+/run/experiments/parallel/mnist/*.matrix
+/run/experiments/parallel/mnist/*.labels

UncollapsedSampler/UncollapsedSampler.vcxproj

@@ -27,28 +27,30 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
+    <UseIntelMKL>Parallel</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>Intel C++ Compiler 17.0</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <UseIntelMKL>Parallel</UseIntelMKL>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -70,10 +72,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$</OutDir>
+    <IncludePath>C:\Program Files %28x86%29\IntelSWTools\compilers_and_libraries_2017.0.109\windows\mkl\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>ppcg</TargetName>
     <OutDir>$(SolutionDir)run\</OutDir>
+    <IncludePath>C:\Program Files %28x86%29\IntelSWTools\compilers_and_libraries_2017.0.109\windows\mkl\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -90,10 +94,11 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../../FastMat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BrowseInformation>true</BrowseInformation>
+      <BrowseInformation>false</BrowseInformation>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mkl_intel_thread.lib;mkl_core.lib;libiomp5md.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Bscmake>
       <PreserveSbr>true</PreserveSbr>
@@ -124,12 +129,12 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\FastMat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
+      <BrowseInformation>false</BrowseInformation>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mkl_intel_thread.lib;mkl_core.lib;libiomp5md.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Bscmake>
       <PreserveSbr>true</PreserveSbr>

UncollapsedSampler/UncollapsedSampler.vcxproj.user

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerCommandArguments>run\experiments\pines\pines.matrix run\experiments\pines\pines_prior.matrix run\experiments\pines\pines_params.matrix 2000</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>run\experiments\mnist\mnist.matrix run\experiments\mnist\mnist_prior.matrix run\experiments\mnist\mnist_params.matrix 500</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>..</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>run\experiments\pines\pines.matrix run\experiments\pines\pines_prior.matrix run\experiments\pines\pines_params.matrix 2000</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>run\experiments\parallel\mnist.matrix run\experiments\parallel\mnist_prior.matrix run\experiments\parallel\mnist_params.matrix 500</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>..</LocalDebuggerWorkingDirectory>
   </PropertyGroup>

UncollapsedSampler/igmm.cpp

@@ -57,7 +57,7 @@ int main(int argc, char** argv)
 	//if (argc>7)
 	//	SAMPLE = atoi(argv[7]);
 
-	step();
+	
 
 	string ss(result_dir);
 	printf("Reading...\n");
@@ -92,6 +92,8 @@ int main(int argc, char** argv)
 	int nlabelsample = ((MAX_SWEEP - BURNIN) / STEP);
 	Matrix sampledLabels(nlabelsample,n);
 	Vector likelihoods(MAX_SWEEP);
+	PILL_DEBUG;
+	step();
 	for (auto iter = 0; iter < MAX_SWEEP; iter++)
 	{
 
@@ -141,7 +143,8 @@ int main(int argc, char** argv)
 
 
 
-
+	step();
+	
 	string s(result_dir);
 	ofstream restfile(s.append("_igmm.rest"), ios::out | ios::binary);
 

UncollapsedSampler/x64/Debug/Uncollap.4BD86494.tlog/CL.command.1.tlog

@@ -1,2 +1,2 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1
-Debug|x64|C:\Users\halidziya\Desktop\I2GMM\UncollapsedSampler\|
+#TargetFrameworkVersion=v4.0:PlatformToolSet=Intel C++ Compiler 17.0:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native64Bit:WindowsTargetPlatformVersion=8.1
+Debug|x64|C:\Users\hzyereba\Desktop\I2Slice\I2Slice\|

UncollapsedSampler/x64/Debug/Uncollap.4BD86494.tlog/CL.read.1.tlog

@@ -1,31 +1,5 @@
 C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppBuild.targets(368,5): warning MSB8004: Output Directory does not end with a trailing slash.  This build instance will add the slash as it is required to allow proper evaluation of the Output Directory.
-  igmm.cpp
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\igmm.cpp(75): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\igmm.cpp(76): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\igmm.cpp(137): warning C4244: 'argument': conversion from 'double' to 'const int', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\igmm.cpp(89): warning C4477: 'printf' : format string '%d' requires an argument of type 'int', but variadic argument 1 has type 'unsigned __int64'
-  c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\igmm.cpp(89): note: consider using '%zd' in the format string
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\igmm.cpp(109): warning C4477: 'printf' : format string '%d' requires an argument of type 'int', but variadic argument 1 has type 'unsigned __int64'
-  c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\igmm.cpp(109): note: consider using '%zd' in the format string
-  Generating Code...
-  Compiling...
-  Table.cpp
-  Restaurant.cpp
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(157): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(174): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(186): warning C4244: 'argument': conversion from 'double' to 'unsigned __int64', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(187): warning C4244: 'argument': conversion from 'double' to 'unsigned __int64', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(202): warning C4477: 'printf' : format string '%d' requires an argument of type 'int', but variadic argument 1 has type 'double'
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(342): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(341): warning C4477: 'printf' : format string '%d' requires an argument of type 'int', but variadic argument 1 has type 'unsigned __int64'
-  c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(341): note: consider using '%zd' in the format string
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(341): warning C4477: 'printf' : format string '%d' requires an argument of type 'int', but variadic argument 2 has type 'unsigned __int64'
-  c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(341): note: consider using '%zd' in the format string
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\restaurant.cpp(361): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
-  DataSet.cpp
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\dataset.cpp(21): warning C4244: '=': conversion from 'double' to 'int', possible loss of data
-c:\users\halidziya\desktop\i2gmm\uncollapsedsampler\uncollapsedsampler\dataset.cpp(35): warning C4244: 'initializing': conversion from 'double' to 'int', possible loss of data
-  Algorithms.cpp
-  Generating Code...
-  UncollapsedSampler.vcxproj -> C:\Users\halidziya\Desktop\I2GMM\UncollapsedSampler\$\UncollapsedSampler.exe
-  UncollapsedSampler.vcxproj -> C:\Users\halidziya\Desktop\I2GMM\UncollapsedSampler\$\UncollapsedSampler.pdb (Partial PDB)
+ipo: : warning #11087: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\lib\amd64\libcpmt.lib: mismatch detected for '_ITERATOR_DEBUG_LEVEL': value '0' does not match value '2' in C:\Users\hzyereba\Desktop\PPCG\UncollapsedSampler\x64\Debug\Algorithms.obj.
+ipo: : warning #11087: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\lib\amd64\libcpmt.lib: mismatch detected for 'RuntimeLibrary': value 'MT_StaticRelease' does not match value 'MTd_StaticDebug' in C:\Users\hzyereba\Desktop\PPCG\UncollapsedSampler\x64\Debug\Algorithms.obj.
+ipo: : warning #11087: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\lib\amd64\libcpmt.lib: mismatch detected for '_ITERATOR_DEBUG_LEVEL': value '0' does not match value '2' in C:\Users\hzyereba\Desktop\PPCG\UncollapsedSampler\x64\Debug\Algorithms.obj.
+ipo: : warning #11087: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\lib\amd64\libcpmt.lib: mismatch detected for 'RuntimeLibrary': value 'MT_StaticRelease' does not match value 'MTd_StaticDebug' in C:\Users\hzyereba\Desktop\PPCG\UncollapsedSampler\x64\Debug\Algorithms.obj.

UncollapsedSampler/x64/Debug/Uncollap.4BD86494.tlog/CL.write.1.tlog

@@ -1,7 +1,7 @@
 experiments='experiments/';
 folder = strcat(experiments,'parallel');
 igmm_mkdir(folder);
-[files names] =  igmm_datasets('..\data'); % Traverse in folder
+[files names] =  igmm_datasets('..\..\data'); % Traverse in folder
 MAXITER=10;
 elapsed_time = zeros(length(files),4,MAXITER);
 macf1        = zeros(length(files),4,MAXITER);
@@ -100,23 +100,23 @@
 %         end
 %         end
 
-
-    tic;
-    [labels,E]=run_dpgmm_subclusters(X', 10, false, 8, false, false, 1, 500, 500);
-    labels = align_labels(labels);
-    p=histc(labels,unique(labels))/length(labels);
-    effectiven(datai,2,iter) = exp(-sum(p.*log(p)));
-    %labels=run_dpgmm_fsd(X',1,false,8,1,40,40);
-    elapsed_time(datai,2,iter)=toc;
-    f1s=evaluationTable(Y(Y~=0),labels(Y~=0));
-    macf1(datai,2,iter)=table2array(f1s(1,1));
-    micf1(datai,2,iter)=table2array(f1s(1,2));
-    numtables(datai,2,iter) = length(unique(labels));
-    changlikelihood(:,iter)=E;
-    subplot(2,2,2);
-    scatter(X(:,1),X(:,2),40,labels,'.')
-    title([ 'JChang Sampler: ' num2str(macf1(datai,2,iter))]);
-    
+% 
+%     tic;
+%     [labels,E]=run_dpgmm_subclusters(X', 10, false, 8, false, false, 1, 500, 500);
+%     labels = align_labels(labels);
+%     p=histc(labels,unique(labels))/length(labels);
+%     effectiven(datai,2,iter) = exp(-sum(p.*log(p)));
+%     %labels=run_dpgmm_fsd(X',1,false,8,1,40,40);
+%     elapsed_time(datai,2,iter)=toc;
+%     f1s=evaluationTable(Y(Y~=0),labels(Y~=0));
+%     macf1(datai,2,iter)=table2array(f1s(1,1));
+%     micf1(datai,2,iter)=table2array(f1s(1,2));
+%     numtables(datai,2,iter) = length(unique(labels));
+%     changlikelihood(:,iter)=E;
+%     subplot(2,2,2);
+%     scatter(X(:,1),X(:,2),40,labels,'.')
+%     title([ 'JChang Sampler: ' num2str(macf1(datai,2,iter))]);
+%     
 
 
     burn_in = '300';
@@ -154,7 +154,7 @@
 
     plot([mean(likelihood,2)],'k:','linewidth',3);hold on;
     plot([mean(slikelihood,2)],'linewidth',3);hold on;
-    plot([mean(changlikelihood(1:size(likelihood,1),:),2)],'r--','linewidth',3);hold off;
+    %plot([mean(changlikelihood(1:size(likelihood,1),:),2)],'r--','linewidth',3);hold off;
 
     %title('Likelihoods','FontSize',18);
     h=legend(['PPCG';'PSS ';'SUBC'],'Location','southeast');