Changeset 7e6968

Timestamp:

08/02/09 20:01:49 (4 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Branches:

master, python3

Children:

014d05

Parents:

36b305

git-author:

Tiago de Paula Peixoto <tiago@…> (08/02/09 13:56:19)

git-committer:

Tiago de Paula Peixoto <tiago@…> (08/02/09 20:01:49)

Message:

Implement show_config()

This prints useful library information.

Files:

• configure.ac (modified) (3 diffs)
• src/graph/graph_bind.cc (modified) (4 diffs)
• src/graph_tool/__init__.py (modified) (1 diff)
• src/graph_tool/core.py (modified) (1 diff)

configure.ac

@@ -174 +174 @@
 AC_ARG_WITH([numpy], [AC_HELP_STRING([--with-numpy=DIR],
                      [directory where numpy is installed
-                      [default=${PYLIBDIR}/numpy] ])],
+                      [default=${PYTHON_SITE_PKG}/numpy] ])],
         NUMPY_DIR=$withval)
-NUMPY_DIR="${NUMPY_DIR}/core/include/numpy"
+[NUMPY_DIR="${NUMPY_DIR}/core/include/numpy"]
 AC_CHECK_HEADER([${NUMPY_DIR}/arrayobject.h],
                 [CPPFLAGS="${CPPFLAGS} -I${NUMPY_DIR}"],
@@ -187 +187 @@
 AC_ARG_WITH([scipy], [AC_HELP_STRING([--with-scipy=DIR],
                      [scipy install directory
-                      [default=${PYLIBDIR}/scipy] ])],
+                      [default=${PYTHON_SITE_PKG}/scipy] ])],
             [SCIPY_DIR=$withval])
 AC_CHECK_HEADER([${SCIPY_DIR}/weave/scxx/object.h],
@@ -233 +233 @@
 dnl Subst PYTHON_DIR.
 AC_DEFINE_UNQUOTED([INSTALL_PREFIX],"${prefix}", [python prefix])
-AC_DEFINE_UNQUOTED([PYTHON_DIR], "${PYLIBDIR}", [The directory name for the site-packages subdirectory of the standard Python install tree.])
+AC_DEFINE_UNQUOTED([PYTHON_DIR], "${PYTHON_SITE_PKG}", [The directory name for the site-packages subdirectory of the standard Python install tree.])
 
 AC_DEFINE_UNQUOTED([CXXFLAGS],"${CXXFLAGS}", [c++ compilation options])
 AC_DEFINE_UNQUOTED([CPPFLAGS],"${CPPFLAGS}", [c++ preprocessor compilation options])
+AC_DEFINE_UNQUOTED([LDFLAGS],"${LDFLAGS}", [linker options])
 
 AC_DEFINE_UNQUOTED([PACKAGE_DATA_DIR], "${packageprefix}/${packagedatadir}", [package data dir])

src/graph/graph_bind.cc

@@ -46 +46 @@
                                         ", " GIT_COMMIT_DATE ")";}
     string GetLicense()   const {return "GPL version 3 or above";}
-    string GetCXXFLAGS()  const {return CXXFLAGS " " CPPFLAGS;}
+    string GetCXXFLAGS()  const {return CPPFLAGS " " CXXFLAGS " " LDFLAGS;}
     string GetInstallPrefix() const {return INSTALL_PREFIX;}
     string GetPythonDir() const {return PYTHON_DIR;}
+    string GetGCCVersion() const
+    {
+        stringstream s;
+        s << __GNUC__ << "." << __GNUC_MINOR__ << "." <<  __GNUC_PATCHLEVEL__;
+        return s.str();
+    }
 };
 
@@ -289 +295 @@
 }
 
+bool openmp_enabled()
+{
+    #ifdef USING_OPENMP
+    return true;
+    #else
+    return false;
+    #endif
+}
+
 BOOST_PYTHON_MODULE(libgraph_tool_core)
 {
@@ -304 +319 @@
 
     def("graph_filtering_enabled", &graph_filtering_enabled);
+    def("openmp_enabled", &openmp_enabled);
 
     mpl::for_each<mpl::push_back<scalar_types,string>::type>(export_vector_types());
@@ -380 +396 @@
         .add_property("cxxflags", &LibInfo::GetCXXFLAGS)
         .add_property("install_prefix", &LibInfo::GetInstallPrefix)
-        .add_property("python_dir", &LibInfo::GetPythonDir);
+        .add_property("python_dir", &LibInfo::GetPythonDir)
+        .add_property("gcc_version", &LibInfo::GetGCCVersion);
 
     def("get_graph_type", &get_graph_type);

src/graph_tool/__init__.py

@@ -95 +95 @@
 from . core import  __version__, Graph, GraphError, Vector_bool, \
      Vector_int32_t, Vector_int64_t, Vector_double, Vector_long_double,\
-     Vector_string, value_types, load_graph, PropertyMap, Vertex, Edge
+     Vector_string, value_types, load_graph, PropertyMap, Vertex, Edge,\
+     show_config
 
 __all__ = ["Graph", "Vertex", "Edge", "GraphError", "Vector_bool",
            "Vector_int32_t", "Vector_int64_t", "Vector_double",
            "Vector_long_double", "Vector_string", "value_types", "load_graph",
-           "PropertyMap"]
+           "PropertyMap", "show_config"]

src/graph_tool/core.py

@@ -125 +125 @@
     raise ValueError("invalid property value type: " + type_name)
 
+def show_config():
+    info = libcore.mod_info()
+    print "version:", info.version
+    print "gcc version:", info.gcc_version
+    print "compilation flags:", info.cxxflags
+    print "install prefix:", info.install_prefix
+    print "python dir:", info.python_dir
+    print "graph filtering:", libcore.graph_filtering_enabled()
+    print "openmp:", libcore.openmp_enabled()
+    print "uname:", " ".join(os.uname())
 
 ################################################################################