upgrade alea 3.0.2-beta1

quantalea · Nov 2, 2016 · c4474b5 · c4474b5
1 parent 28fb182
commit c4474b5
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 84 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -2,8 +2,7 @@ content: none
 source https://www.nuget.org/api/v2
 source http://nuget.aleagpu.com/nuget
 source http://beta.aleagpu.com/nuget
-nuget Alea 3.0.0-beta19
-nuget Alea.Parallel 3.0.0-beta19
+nuget Alea 3.0.2-beta1
 nuget CSMatIO
 nuget Fake
 nuget Nuget.CommandLine

diff --git a/paket.lock b/paket.lock
@@ -1,9 +1,7 @@
 CONTENT: NONE
 NUGET
   remote: https://www.nuget.org/api/v2
-    Alea (3.0.0-beta19)
-    Alea.Parallel (3.0.0-beta19)
-      Alea (3.0.0-beta19)
+    Alea (3.0.2-beta1)
     CSMatIO (1.0.2)
       zlib.net (>= 1.0.4)
     FAKE (4.28)

diff --git a/src/AleaTK/AleaTK.csproj b/src/AleaTK/AleaTK.csproj
@@ -96,28 +96,27 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="Alea">
-          <HintPath>..\..\packages\Alea\lib\net40\Alea.dll</HintPath>
+        <Reference Include="Alea.IL">
+          <HintPath>..\..\packages\Alea\lib\net45\Alea.IL.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
         <Reference Include="Alea.Parallel">
-          <HintPath>..\..\packages\Alea.Parallel\lib\net40\Alea.Parallel.dll</HintPath>
+          <HintPath>..\..\packages\Alea\lib\net45\Alea.Parallel.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="Alea">
+          <HintPath>..\..\packages\Alea\lib\net45\Alea.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
   </Choose>
   <Import Project="..\..\packages\Alea\build\Alea.targets" Condition="Exists('..\..\packages\Alea\build\Alea.targets')" Label="Paket" />
-  <Import Project="..\..\.paket\paket.targets" />
 </Project>
diff --git a/src/AleaTK/Expr.cs b/src/AleaTK/Expr.cs
@@ -508,7 +508,7 @@ public bool AssignByFlat1<T>(ILValue<T> lValue, IRValue<T> rValue)
             if (Context.Type == ContextType.Gpu)
             {
                 var stream = Context.ToGpuContext().Stream;
-                stream.For(0L, length, i => write(i, read(i)));
+                stream.LongFor(0L, length, i => write(i, read(i)));
                 return true;
             }
 
@@ -531,7 +531,7 @@ public bool AssignByRank2<T>(ILValue<T> lValue, IRValue<T> rValue)
             if (Context.Type == ContextType.Gpu)
             {
                 var stream = Context.ToGpuContext().Stream;
-                stream.For(0L, rows * cols, i =>
+                stream.LongFor(0L, rows * cols, i =>
                 {
                     var row = i / cols;
                     var col = i % cols;
@@ -566,7 +566,7 @@ public bool AssignByRank3<T>(ILValue<T> lValue, IRValue<T> rValue)
             if (Context.Type == ContextType.Gpu)
             {
                 var stream = Context.ToGpuContext().Stream;
-                stream.For(0L, l0*l1*l2, i =>
+                stream.LongFor(0L, l0*l1*l2, i =>
                 {
                     var i0 = i/(l1*l2);
                     var i1 = (i%(l1*l2))/l2;

diff --git a/src/AleaTK/ExprImpl/ReduceExpr.cs b/src/AleaTK/ExprImpl/ReduceExpr.cs
@@ -154,7 +154,7 @@ protected override bool Execute(Assignment assignment, ILValue<T> output)
                         var stream = assignment.Context.ToGpuContext().Stream;
 
                         // This is a quick fix, it is not good performance
-                        stream.For(0L, cols, col =>
+                        stream.LongFor(0L, cols, col =>
                         {
                             var acc = read(0L, col);
                             for (var row = 1L; row < rows; ++row)

diff --git a/src/AleaTK/paket.references b/src/AleaTK/paket.references
@@ -1,2 +1 @@
-Alea
-Alea.Parallel
+Alea
diff --git a/src/AleaTKUtil/AleaTKUtil.csproj b/src/AleaTKUtil/AleaTKUtil.csproj
@@ -53,6 +53,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\..\.paket\paket.targets" />
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
       <ItemGroup>
@@ -87,5 +88,4 @@
       <Paket>True</Paket>
     </Reference>
   </ItemGroup>
-  <Import Project="..\..\.paket\paket.targets" />
 </Project>
diff --git a/tests/AleaTKTest/AleaTKTest.csproj b/tests/AleaTKTest/AleaTKTest.csproj
@@ -82,22 +82,22 @@
       <Name>AleaTK</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="Alea">
-          <HintPath>..\..\packages\Alea\lib\net40\Alea.dll</HintPath>
+        <Reference Include="Alea.IL">
+          <HintPath>..\..\packages\Alea\lib\net45\Alea.IL.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
         <Reference Include="Alea.Parallel">
-          <HintPath>..\..\packages\Alea.Parallel\lib\net40\Alea.Parallel.dll</HintPath>
+          <HintPath>..\..\packages\Alea\lib\net45\Alea.Parallel.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="Alea">
+          <HintPath>..\..\packages\Alea\lib\net45\Alea.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -177,5 +177,4 @@
     </Reference>
   </ItemGroup>
   <Import Project="..\..\packages\Alea\build\Alea.targets" Condition="Exists('..\..\packages\Alea\build\Alea.targets')" Label="Paket" />
-  <Import Project="..\..\.paket\paket.targets" />
 </Project>
diff --git a/tests/AleaTKTest/paket.references b/tests/AleaTKTest/paket.references
@@ -1,6 +1,5 @@
 NUnit
 Alea
-Alea.Parallel
 NUnit.Runners.Net4
 CSMatIO
 SharpZipLib
diff --git a/tutorial/samples/MNIST/MNIST.csproj b/tutorial/samples/MNIST/MNIST.csproj
@@ -68,22 +68,22 @@
     <None Include="Extended.md" />
     <None Include="Readme.md" />
   </ItemGroup>
+  <Import Project="..\..\..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="Alea">
-          <HintPath>..\..\..\packages\Alea\lib\net40\Alea.dll</HintPath>
+        <Reference Include="Alea.IL">
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.IL.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
         <Reference Include="Alea.Parallel">
-          <HintPath>..\..\..\packages\Alea.Parallel\lib\net40\Alea.Parallel.dll</HintPath>
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.Parallel.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="Alea">
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -98,5 +98,4 @@
     </Reference>
   </ItemGroup>
   <Import Project="..\..\..\packages\Alea\build\Alea.targets" Condition="Exists('..\..\..\packages\Alea\build\Alea.targets')" Label="Paket" />
-  <Import Project="..\..\..\.paket\paket.targets" />
 </Project>
diff --git a/tutorial/samples/MNIST/paket.references b/tutorial/samples/MNIST/paket.references
@@ -1,3 +1,2 @@
 Alea
-Alea.Parallel
 NUnit
diff --git a/tutorial/samples/MonteCarloPi/MonteCarloPi.csproj b/tutorial/samples/MonteCarloPi/MonteCarloPi.csproj
@@ -66,22 +66,22 @@
     <None Include="Extended.md" />
     <None Include="Readme.md" />
   </ItemGroup>
+  <Import Project="..\..\..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="Alea">
-          <HintPath>..\..\..\packages\Alea\lib\net40\Alea.dll</HintPath>
+        <Reference Include="Alea.IL">
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.IL.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
         <Reference Include="Alea.Parallel">
-          <HintPath>..\..\..\packages\Alea.Parallel\lib\net40\Alea.Parallel.dll</HintPath>
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.Parallel.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="Alea">
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -96,5 +96,4 @@
     </Reference>
   </ItemGroup>
   <Import Project="..\..\..\packages\Alea\build\Alea.targets" Condition="Exists('..\..\..\packages\Alea\build\Alea.targets')" Label="Paket" />
-  <Import Project="..\..\..\.paket\paket.targets" />
 </Project>
diff --git a/tutorial/samples/MonteCarloPi/paket.references b/tutorial/samples/MonteCarloPi/paket.references
@@ -1,3 +1,2 @@
 NUnit
-Alea
-Alea.Parallel
+Alea
diff --git a/tutorial/samples/PTB/PTB.csproj b/tutorial/samples/PTB/PTB.csproj
@@ -78,22 +78,22 @@
       <Name>AleaTK</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="Alea">
-          <HintPath>..\..\..\packages\Alea\lib\net40\Alea.dll</HintPath>
+        <Reference Include="Alea.IL">
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.IL.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
         <Reference Include="Alea.Parallel">
-          <HintPath>..\..\..\packages\Alea.Parallel\lib\net40\Alea.Parallel.dll</HintPath>
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.Parallel.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="Alea">
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -173,5 +173,4 @@
     </Reference>
   </ItemGroup>
   <Import Project="..\..\..\packages\Alea\build\Alea.targets" Condition="Exists('..\..\..\packages\Alea\build\Alea.targets')" Label="Paket" />
-  <Import Project="..\..\..\.paket\paket.targets" />
 </Project>
diff --git a/tutorial/samples/PTB/paket.references b/tutorial/samples/PTB/paket.references
@@ -1,5 +1,4 @@
 Alea
 NUnit
 SharpZipLib
-Alea.Parallel
 CSMatIO
diff --git a/tutorial/samples/WMT/WMT.csproj b/tutorial/samples/WMT/WMT.csproj
@@ -73,22 +73,22 @@
       <Name>AleaTK</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="Alea">
-          <HintPath>..\..\..\packages\Alea\lib\net40\Alea.dll</HintPath>
+        <Reference Include="Alea.IL">
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.IL.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
-      <ItemGroup>
         <Reference Include="Alea.Parallel">
-          <HintPath>..\..\..\packages\Alea.Parallel\lib\net40\Alea.Parallel.dll</HintPath>
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.Parallel.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="Alea">
+          <HintPath>..\..\..\packages\Alea\lib\net45\Alea.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -141,5 +141,4 @@
     </When>
   </Choose>
   <Import Project="..\..\..\packages\Alea\build\Alea.targets" Condition="Exists('..\..\..\packages\Alea\build\Alea.targets')" Label="Paket" />
-  <Import Project="..\..\..\.paket\paket.targets" />
 </Project>
diff --git a/tutorial/samples/WMT/paket.references b/tutorial/samples/WMT/paket.references
@@ -1,4 +1,3 @@
 NUnit
 Alea
-Alea.Parallel
 SharpZipLib