Merge branch 'master' of bitbucket.org:bohrium/bohrium

bh107 · Dec 17, 2013 · 98ff718 · 98ff718
2 parents 7847c83 + 29eb1bc
commit 98ff718
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/bridge/numpy b/bridge/numpy
diff --git a/doc/source/installation/linux.rst b/doc/source/installation/linux.rst
@@ -8,8 +8,8 @@ Get it!
 
 Download and extract the current version (v0.2)::
 
-  wget http://bohrium-v0.2.tgz
-  tar -xzf bohrium-v0.2.tg
+  wget https://bitbucket.org/bohrium/bohrium/downloads/bohrium-v0.2.tgz
+  tar -xzf bohrium-v0.2.tgz
 
 
 .. _numpy_installation:

diff --git a/doc/source/installation/osx.rst b/doc/source/installation/osx.rst
@@ -15,8 +15,8 @@ If you also want to build the Mono libraries, you also need the Mono package::
 
 Download and extract the current version (v0.2)::
 
-  wget http://bohrium-v0.2.tgz
-  tar -xzf bohrium-v0.2.tg
+  wget https://bitbucket.org/bohrium/bohrium/downloads/bohrium-v0.2.tgz
+  tar -xzf bohrium-v0.2.tgz
 
 When building and install Bohrium we need to specify the newly installed Python interpreter. In this case we use Python version 2.7::
 

diff --git a/ve/cpu/compiler.cpp b/ve/cpu/compiler.cpp
@@ -81,12 +81,12 @@ class process: compiler {
         std::string kernel_path,
         bool do_preload
     ) :
-        process_str(process_str), 
+        process_str(process_str),
         object_path(object_path),
         kernel_path(kernel_path)
     {
         // Create an identifier with low collision...
-        static const char alphanum[] = 
+        static const char alphanum[] =
             "0123456789"
             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
             "abcdefghijklmnopqrstuvwxyz";
@@ -158,7 +158,7 @@ class process: compiler {
             }
             symbol_file.close();
         }
-        std::cout << nloaded-prev << " from a single shared library." << std::endl;
+//        std::cout << nloaded-prev << " from a single shared library." << std::endl;
 
         res = true;     // Load a single function from shared library
         prev = nloaded;
@@ -170,7 +170,7 @@ class process: compiler {
                 nloaded += res;
             }
         }
-        std::cout << nloaded-prev << " from multiple shared libraries." << std::endl;
+//        std::cout << nloaded-prev << " from multiple shared libraries." << std::endl;
         return nloaded;
     }
 
@@ -188,7 +188,7 @@ class process: compiler {
         );
 
         if (0==handles.count(library)) {    // Open library
-            handles[library] = dlopen(          
+            handles[library] = dlopen(
                 library_fn.c_str(),
                 RTLD_NOW
             );

diff --git a/vem/cluster/exec.cpp b/vem/cluster/exec.cpp
@@ -23,6 +23,7 @@ If not, see <http://www.gnu.org/licenses/>.
 #include <iostream>
 #include <vector>
 #include <set>
+#include <map>
 #include <bh.h>
 
 #include "bh_vem_cluster.h"