Cleanup items prior to final release. Fix ndarray cast to bool to cal…

…l any().
RobAmos · Jun 22, 2011 · 3d3b8c2 · 3d3b8c2
1 parent 59bcea3
commit 3d3b8c2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/libndarray/windows/msvc2008.vcxproj b/libndarray/windows/msvc2008.vcxproj
@@ -74,10 +74,10 @@
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
     <CustomBuildBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PreBuildEvent</CustomBuildBeforeTargets>
     <CustomBuildBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compile</CustomBuildBeforeTargets>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>

diff --git a/numpy/NumpyDotNet/NpyCoreApi.cs b/numpy/NumpyDotNet/NpyCoreApi.cs
@@ -2768,7 +2768,13 @@ static NpyCoreApi() {
 
         #region Memory verification
 
+        // Turns on/off verification of native memory handles.  This functionality adds substantial runtime
+        // overhead but can be invaluable in tracking down accesses of freed pointers and other faults.
+#if DEBUG
         private const bool CheckMemoryAccesses = true;
+#else
+        private const bool CheckMemoryAccesses = false;
+#endif
 
         /// <summary>
         /// Set of all currently allocated GCHandles and the type of handle.

diff --git a/numpy/NumpyDotNet/ndarray.cs b/numpy/NumpyDotNet/ndarray.cs
@@ -935,7 +935,7 @@ public object __complex__(CodeContext cntx) {
         }
 
         public bool __nonzero__() {
-            return (bool)this;
+            return (bool)this.any();
         }
 
         public static explicit operator bool(ndarray arr) {

diff --git a/numpy/linalg/lapack_lite.vcxproj b/numpy/linalg/lapack_lite.vcxproj
@@ -60,7 +60,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <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;ndarray.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);..\..\..\numpy-refactor\numpy\NumpyDotNet\bin\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);..\..\..\numpy-refactor\numpy\NumpyDotNet\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>