Python API wrappers are now part of OpenMM

65b9d0b6 · Peter Eastman · abb19052 · 65b9d0b6 · 65b9d0b6 · 65b9d0b6
Commit 65b9d0b6 authored Feb 26, 2011 by Peter Eastman
20 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,7 +230,8 @@ FOREACH(subdir ${OPENMM_SOURCE_SUBDIRS})
    # append
    SET(API_INCLUDE_DIRS ${API_INCLUDE_DIRS}
                         ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/include 
-                         ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/include/internal)
+                         ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/include/openmm
+                         ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/include/openmm/internal)
 ENDFOREACH(subdir)
 # We'll need both *relative* path names, starting with their API_INCLUDE_DIRS,
@@ -276,15 +277,15 @@ FIND_PROGRAM(GCCXML_PATH gccxml PATH
    "C:/Program Files/gccxml 0.9/bin"
 )
 IF(GCCXML_PATH AND JAVA_RUNTIME AND NOT cmv EQUAL "2.4")
-    SET(OPENMM_BUILD_API_WRAPPERS ON CACHE BOOL "Build wrappers for C and Fortran")
+    SET(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS ON CACHE BOOL "Build wrappers for C and Fortran")
 ELSE(GCCXML_PATH AND JAVA_RUNTIME AND NOT cmv EQUAL "2.4")
-    SET(OPENMM_BUILD_API_WRAPPERS OFF CACHE BOOL "Build wrappers for C and Fortran")
+    SET(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS OFF CACHE BOOL "Build wrappers for C and Fortran")
 ENDIF(GCCXML_PATH AND JAVA_RUNTIME AND NOT cmv EQUAL "2.4")
-IF(OPENMM_BUILD_API_WRAPPERS)
+IF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
    ADD_SUBDIRECTORY(wrappers)
    SET(SOURCE_FILES ${SOURCE_FILES} wrappers/OpenMMCWrapper.cpp  wrappers/OpenMMFortranWrapper.cpp)
    SET_SOURCE_FILES_PROPERTIES(wrappers/OpenMMCWrapper.cpp wrappers/OpenMMFortranWrapper.cpp PROPERTIES GENERATED TRUE)
-ENDIF(OPENMM_BUILD_API_WRAPPERS)
+ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
@@ -297,12 +298,12 @@ IF(OPENMM_BUILD_STATIC_LIB)
    SET_TARGET_PROPERTIES(${STATIC_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES -DOPENMM_BUILDING_STATIC_LIBRARY -DLEPTON_USE_STATIC_LIBRARIES -DLEPTON_BUILDING_STATIC_LIBRARY -DOPENMMM_VALIDATE_BUILDING_STATIC_LIBRARY -DOPENMM_VALIDATE_BUILDING_STATIC_LIBRARY")
 ENDIF(OPENMM_BUILD_STATIC_LIB)
-IF(OPENMM_BUILD_API_WRAPPERS)
+IF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
    ADD_DEPENDENCIES(${SHARED_TARGET} ApiWrappers)
    IF(OPENMM_BUILD_STATIC_LIB)
        ADD_DEPENDENCIES(${STATIC_TARGET} ApiWrappers)
    ENDIF(OPENMM_BUILD_STATIC_LIB)
-ENDIF(OPENMM_BUILD_API_WRAPPERS)
+ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
 # On Linux need to link to libdl
 FIND_LIBRARY(DL_LIBRARY dl)
@@ -416,6 +417,30 @@ INSTALL_FILES(/include                 FILES ${CORE_HEADERS})
 INSTALL_FILES(/include/openmm          FILES ${TOP_HEADERS})
 INSTALL_FILES(/include/openmm/internal FILES ${INTERNAL_HEADERS})
+# Serialization support
+SET(OPENMM_BUILD_SERIALIZATION_SUPPORT ON CACHE BOOL "Whether to build the serialization support library")
+IF (OPENMM_BUILD_SERIALIZATION_SUPPORT)
+    ADD_SUBDIRECTORY(serialization)
+ENDIF (OPENMM_BUILD_SERIALIZATION_SUPPORT)
+# Python wrappers
+SET(OPENMM_BUILD_PYTHON_WRAPPERS OFF CACHE BOOL "Build wrappers for Python")
+IF(OPENMM_BUILD_PYTHON_WRAPPERS)
+    IF(NOT OPENMM_BUILD_SERIALIZATION_SUPPORT)
+        MESSAGE(SEND_ERROR "The Python wrappers require that serialization support be built.")
+    ENDIF(NOT OPENMM_BUILD_SERIALIZATION_SUPPORT)
+    IF(NOT OPENMM_BUILD_FREE_ENERGY_PLUGIN)
+        MESSAGE(SEND_ERROR "The Python wrappers require that the free energy plugin be built.")
+    ENDIF(NOT OPENMM_BUILD_FREE_ENERGY_PLUGIN)
+    IF(NOT OPENMM_BUILD_AMOEBA_PLUGIN)
+        MESSAGE(SEND_ERROR "The Python wrappers require that the AMOEBA plugin be built.")
+    ENDIF(NOT OPENMM_BUILD_AMOEBA_PLUGIN)
+    ADD_SUBDIRECTORY(wrappers/python)
+ENDIF(OPENMM_BUILD_PYTHON_WRAPPERS)
 #
 # Allow automated build and dashboard.
 #
@@ -495,9 +520,4 @@ install(FILES ${LICENSE_FILES}
 ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(examples)
-SET(OPENMM_BUILD_SERIALIZATION_SUPPORT ON CACHE BOOL "Whether to build the serialization support library")
-IF (OPENMM_BUILD_SERIALIZATION_SUPPORT)
-    ADD_SUBDIRECTORY(serialization)
-ENDIF (OPENMM_BUILD_SERIALIZATION_SUPPORT)
 ENDIF(NOT cmv EQUAL "2.4") # This whole file...
--- a/platforms/cuda/sharedTarget/CMakeLists.txt
+++ b/platforms/cuda/sharedTarget/CMakeLists.txt
@@ -32,7 +32,7 @@ IF(APPLE AND CMAKE_OSX_ARCHITECTURES AND CMAKE_OSX_ARCHITECTURES MATCHES .*i386.
    CUDA_ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
    TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${MAIN_OPENMM_LIB} ${CUFFT_TARGET_LINK})
    SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMMCUDA_BUILDING_SHARED_LIBRARY")
-    ADD_DEPENDENCIES(${SHARED_TARGET} "{SHARED_TARGET}32")
+    ADD_DEPENDENCIES(${SHARED_TARGET} "${SHARED_TARGET}32")
    # Join them into a single universal binary.

--- a/plugins/amoeba/CMakeLists.txt
+++ b/plugins/amoeba/CMakeLists.txt
@@ -184,12 +184,12 @@ ENDIF(OPENMM_BUILD_AMOEBA_CUDA_LIB)
 #    ADD_SUBDIRECTORY(platforms/opencl)
 #ENDIF(OPENMM_BUILD_OPENCL_LIB)
-INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_AMOEBA_TARGET})
+INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${SHARED_AMOEBA_TARGET})
 IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
    INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_AMOEBA_SERIALIZABLE_TARGET})
 ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
 IF(OPENMM_BUILD_STATIC_LIB)
-  INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${STATIC_AMOEBA_TARGET})
+  INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${STATIC_AMOEBA_TARGET})
 ENDIF(OPENMM_BUILD_STATIC_LIB)
 FILE(GLOB CORE_HEADERS     include/*.h          */include/*.h)
 FILE(GLOB TOP_HEADERS      include/openmm/*.h          */include/openmm/*.h)

--- a/plugins/amoeba/platforms/cuda/sharedTarget/CMakeLists.txt
+++ b/plugins/amoeba/platforms/cuda/sharedTarget/CMakeLists.txt
@@ -85,7 +85,7 @@ IF(APPLE AND CMAKE_OSX_ARCHITECTURES AND CMAKE_OSX_ARCHITECTURES MATCHES .*i386.
    TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${OPENMM_LIBRARY_NAME}Cuda_d optimized ${OPENMM_LIBRARY_NAME}Cuda )
    TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${OPENMM_AMOEBA_LIBRARY_NAME}_d optimized ${OPENMM_AMOEBA_LIBRARY_NAME} )
    SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMMCUDA_BUILDING_SHARED_LIBRARY -DOPENMMCUDAAMOEBA_BUILDING_SHARED_LIBRARY")
-    ADD_DEPENDENCIES(${SHARED_TARGET} "{SHARED_TARGET}32")
+    ADD_DEPENDENCIES(${SHARED_TARGET} "${SHARED_TARGET}32")
    # Join them into a single universal binary.

--- a/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernelFactory.cpp
+++ b/plugins/amoeba/platforms/reference/src/AmoebaReferenceKernelFactory.cpp
@@ -33,6 +33,18 @@
 using namespace OpenMM;
+#if defined(WIN32)
+    #include <windows.h>
+    extern "C" void registerAmoebaSerializationProxies();
+    BOOL WINAPI DllMain(HANDLE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved) {
+        if (ul_reason_for_call == DLL_PROCESS_ATTACH)
+            registerAmoebaSerializationProxies();
+        return TRUE;
+    }
+#else
+    extern "C" void __attribute__((constructor)) registerKernelFactories();
+#endif
 extern "C" void OPENMM_EXPORT registerKernelFactories() {
    for( int ii = 0; ii < Platform::getNumPlatforms(); ii++ ){
        Platform& platform = Platform::getPlatform(ii);

--- a/plugins/amoeba/serialization/src/AmoebaSerializationProxyRegistration.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaSerializationProxyRegistration.cpp
@@ -85,39 +85,6 @@
 using namespace OpenMM;
 extern "C" void registerAmoebaSerializationProxies() {
-    // force libOpenMMSerialization to load before libOpenMMSerialization
-    // required in order guarantee initialization of
-    //    map<const string, const SerializationProxy*> SerializationProxy::proxiesByType;
-    //    map<const string, const SerializationProxy*> SerializationProxy::proxiesByName;
-    // is there a cleaner solution?
-#ifdef WIN32
-    std::string file = "OpenMMSerialization.dll";
-    // Tell Windows not to bother the user with ugly error boxes.
-    const UINT oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
-    HMODULE handle = LoadLibrary(file.c_str());
-    SetErrorMode(oldErrorMode); // Restore previous error mode.
-    if (handle == NULL) {
-        std::string message;
-        std::stringstream(message) << "Error loading library " << file << ": " << GetLastError();
-        throw OpenMMException(message);
-    }   
-#else
-    std::string fileName  = "OpenMMSerialization";
-    std::string file      = "libOpenMMSerialization.so";
-    std::string macFile   = "libOpenMMSerialization.dylib";
-    void *handle = dlopen(file.c_str(), RTLD_LAZY | RTLD_GLOBAL);
-    if (handle == NULL){
-        handle = dlopen(macFile.c_str(), RTLD_LAZY | RTLD_GLOBAL);
-        if (handle == NULL){
-            throw OpenMMException("Error loading library "+fileName+": "+dlerror());
-        }
-    }
-#endif
    SerializationProxy::registerProxy(typeid(AmoebaGeneralizedKirkwoodForce),         new AmoebaGeneralizedKirkwoodForceProxy());
    SerializationProxy::registerProxy(typeid(AmoebaHarmonicBondForce),                new AmoebaHarmonicBondForceProxy());
    SerializationProxy::registerProxy(typeid(AmoebaHarmonicAngleForce),               new AmoebaHarmonicAngleForceProxy());

--- a/plugins/freeEnergy/CMakeLists.txt
+++ b/plugins/freeEnergy/CMakeLists.txt
@@ -154,9 +154,9 @@ ENDIF(OPENMM_BUILD_FREE_ENERGY_CUDA_LIB)
 #    ADD_SUBDIRECTORY(platforms/opencl)
 #ENDIF(OPENMM_BUILD_OPENCL_LIB)
-INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_FREE_ENERGY_TARGET})
+INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${SHARED_FREE_ENERGY_TARGET})
 IF(OPENMM_BUILD_STATIC_LIB)
-  INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${STATIC_FREE_ENERGY_TARGET})
+  INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${STATIC_FREE_ENERGY_TARGET})
 ENDIF(OPENMM_BUILD_STATIC_LIB)
 FILE(GLOB CORE_HEADERS     include/*.h          */include/*.h)
 FILE(GLOB TOP_HEADERS      include/openmm/*.h          */include/openmm/*.h)

--- a/plugins/freeEnergy/platforms/cuda/sharedTarget/CMakeLists.txt
+++ b/plugins/freeEnergy/platforms/cuda/sharedTarget/CMakeLists.txt
@@ -42,7 +42,7 @@ IF(APPLE AND CMAKE_OSX_ARCHITECTURES AND CMAKE_OSX_ARCHITECTURES MATCHES .*i386.
    TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${OPENMM_LIBRARY_NAME}Cuda_d optimized ${OPENMM_LIBRARY_NAME}Cuda )
    TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${OPENMM_FREE_ENERGY_LIBRARY_NAME}_d optimized ${OPENMM_FREE_ENERGY_LIBRARY_NAME} )
    SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMMCUDAFREEENERGY_BUILDING_SHARED_LIBRARY")
-    ADD_DEPENDENCIES(${SHARED_TARGET} "{SHARED_TARGET}32")
+    ADD_DEPENDENCIES(${SHARED_TARGET} "${SHARED_TARGET}32")
    # Join them into a single universal binary.

--- a/plugins/freeEnergy/platforms/reference/src/ReferenceFreeEnergyKernelFactory.cpp
+++ b/plugins/freeEnergy/platforms/reference/src/ReferenceFreeEnergyKernelFactory.cpp
@@ -36,6 +36,18 @@
 using namespace OpenMM;
+#if defined(WIN32)
+    #include <windows.h>
+    extern "C" void registerAmoebaSerializationProxies();
+    BOOL WINAPI DllMain(HANDLE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved) {
+        if (ul_reason_for_call == DLL_PROCESS_ATTACH)
+            registerAmoebaSerializationProxies();
+        return TRUE;
+    }
+#else
+    extern "C" void __attribute__((constructor)) registerKernelFactories();
+#endif
 extern "C" void registerKernelFactories() {
    for( int ii = 0; ii < Platform::getNumPlatforms(); ii++ ){
        Platform& platform = Platform::getPlatform(ii);

--- a/wrappers/python/CMakeLists.txt
+++ b/wrappers/python/CMakeLists.txt
+find_program(PYTHON_EXECUTABLE NAMES python)
+#############################################
+### Copy all source files to staging area ###
+#############################################
+# OPENMM_PYTHON_STAGING_DIR is a staging area for python, swig, and C files in the python package we are making.
+set(OPENMM_PYTHON_STAGING_DIR "${CMAKE_BINARY_DIR}/python"
+    CACHE PATH "Temporary staging area for Python API wrappers")
+mark_as_advanced(OPENMM_PYTHON_STAGING_DIR)
+# Create package directory structure
+file(MAKE_DIRECTORY ${OPENMM_PYTHON_STAGING_DIR}/simtk/chem/openmm)
+file(MAKE_DIRECTORY ${OPENMM_PYTHON_STAGING_DIR}/simtk/unit)
+file(MAKE_DIRECTORY ${OPENMM_PYTHON_STAGING_DIR}/src/swig_doxygen/swig_lib/python)
+##############################################################################
+### Identify files that need to be copied from source area to staging area ###
+##############################################################################
+set(STAGING_OUTPUT_FILES "") # Will contain all required package files
+file(GLOB STAGING_INPUT_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST.in"
+    "${CMAKE_CURRENT_SOURCE_DIR}/README.txt"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.py"
+)
+# file(GLOB_RECURSE temp RELATIVE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/src/*.i")
+# foreach(f ${temp})
+#     set(temp2 "${temp2}\n${f}")
+# endforeach()
+set(SUBDIRS src simtk)
+foreach(SUBDIR ${SUBDIRS})
+    file(GLOB_RECURSE STAGING_INPUT_FILES1 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/*README.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/*.py"
+        "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/*.i"
+        "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/*.sh"
+    )
+    foreach(file ${STAGING_INPUT_FILES1})
+        set(STAGING_INPUT_FILES ${STAGING_INPUT_FILES} "${file}")
+    endforeach(file ${STAGING_INPUT_FILES1})
+endforeach(SUBDIR ${SUBDIRS})
+# message("STAGING_INPUT_FILES = " ${STAGING_INPUT_FILES})
+foreach(INIT_FILE ${STAGING_INPUT_FILES})
+    set(infile "${CMAKE_CURRENT_SOURCE_DIR}/${INIT_FILE}")
+    set(outfile "${OPENMM_PYTHON_STAGING_DIR}/${INIT_FILE}")
+    add_custom_command(
+        OUTPUT "${outfile}"
+        COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${infile}" "${outfile}"
+        DEPENDS "${infile}"
+        COMMENT "CMake-copying file ${infile} to ${outfile}")
+    set(STAGING_OUTPUT_FILES ${STAGING_OUTPUT_FILES} "${outfile}")
+    # message("STAGING_OUTPUT_FILE = " ${outfile})
+endforeach(INIT_FILE ${STAGING_INPUT_FILES})
+# Swig wrapper need to be rebuilt if the API has changed
+set(OPENMM_PYTHON_BUILD_SWIG ON CACHE BOOL "Whether to rebuild swig wrappers vs using the premade ones.")
+if(OPENMM_PYTHON_BUILD_SWIG)
+    # Look in ~/bin/swig first, more likely to be latest version on build machines
+    find_program(SWIG_EXECUTABLE swig PATHS
+        "$ENV{HOME}/bin" "/Users/builder/bin" "/home/builder/bin"
+        NO_DEFAULT_PATH)
+    find_program(SWIG_EXECUTABLE swig)
+    if(SWIG_EXECUTABLE)
+        execute_process(COMMAND ${SWIG_EXECUTABLE} -version
+            OUTPUT_VARIABLE SWIG_VERSION_output ERROR_VARIABLE SWIG_VERSION_output)
+        string(REGEX REPLACE ".*SWIG Version[^0-9.]*\([0-9.]+\).*" "\\1"
+            SWIG_VERSION_output "${SWIG_VERSION_output}")
+        set(SWIG_VERSION ${SWIG_VERSION_output} CACHE STRING "Swig version" FORCE)
+    else(SWIG_EXECUTABLE)
+        set(SWIG_VERSION "0.0.0" CACHE STRING "Swig version" FORCE)
+    endif(SWIG_EXECUTABLE)
+    # Enforce swig version
+    string(COMPARE LESS "${SWIG_VERSION}" "1.3.39" SWIG_VERSION_ERROR)
+    if(SWIG_VERSION_ERROR)
+        message("Swig version must be 1.3.39 or greater! (You have ${SWIG_VERSION})")
+    endif(SWIG_VERSION_ERROR)
+    find_package(Doxygen REQUIRED)
+    mark_as_advanced(CLEAR DOXYGEN_EXECUTABLE)
+    find_package(Java REQUIRED)
+    mark_as_advanced(CLEAR JAVA_RUNTIME)
+    # SWIG_OPENMM_DIR is package area where swig files will be created/used
+    set(SWIG_OPENMM_DIR "${OPENMM_PYTHON_STAGING_DIR}/src/swig_doxygen")
+    file(MAKE_DIRECTORY ${SWIG_OPENMM_DIR}/swig_lib/python)
+    ### Create OpenMM_headers.xml ###
+    # Step 1 - Create Doxyfile to point to OpenMM headers
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/swig_doxygen/doxygen/Doxyfile.in
+        ${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/Doxyfile
+        @ONLY
+    )
+    # Step 2 - Run doxygen in non-package area
+    add_custom_command(
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml/index.xml" "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml/combine.xslt"
+        COMMAND "${DOXYGEN_EXECUTABLE}"
+        DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/Doxyfile"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen"
+        COMMENT "Parsing OpenMM header files with doxygen..."
+    )
+    # Step 3 - Run xslt to create combined xml file
+    add_custom_command(
+        OUTPUT "${SWIG_OPENMM_DIR}/OpenMM_headers.xml"
+        COMMAND ${JAVA_RUNTIME} 
+            -jar "${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar"
+            -t 
+            -s:"${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml/index.xml"
+            -xsl:"${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml/combine.xslt"
+            -o:OpenMM_headers.xml
+        DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml/index.xml" "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml/combine.xslt"
+        WORKING_DIRECTORY "${SWIG_OPENMM_DIR}"
+        COMMENT "Creating combined OpenMM API xml file..."
+    )
+    add_custom_target(CreateCombinedXmlFile DEPENDS
+        "${SWIG_OPENMM_DIR}/OpenMM_headers.xml"
+        "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml/index.xml" 
+        "${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/xml/combine.xslt"
+        ${CMAKE_CURRENT_BINARY_DIR}/src/swig_doxygen/doxygen/Doxyfile)
+    # OpenMM REFERENCE platform first
+    # Files which will be created by python script and used by swig (dynamically generated)
+    set(SWIG_INPUT_FILES_REF
+        "${SWIG_OPENMM_DIR}/swig_lib/python/pythonprepend.i"
+        "${SWIG_OPENMM_DIR}/swig_lib/python/pythonappend.i"
+        "${SWIG_OPENMM_DIR}/OpenMM_docstring.i"
+        "${SWIG_OPENMM_DIR}/OpenMM_headers.i" 
+        # "${SWIG_OPENMM_DIR}/OpenMM.i"
+    )
+    # Swig input files which should have been copied from source tree
+    # file(GLOB SWIG_INPUT_FILES2 "${SWIG_OPENMM_DIR}/swig_lib/python/*.i")
+    set(SWIG_INPUT_FILES2
+        "${SWIG_OPENMM_DIR}/swig_lib/python/exceptions.i"
+        "${SWIG_OPENMM_DIR}/swig_lib/python/extend.i"
+        "${SWIG_OPENMM_DIR}/swig_lib/python/features.i"
+        "${SWIG_OPENMM_DIR}/swig_lib/python/header.i"
+        "${SWIG_OPENMM_DIR}/swig_lib/python/pythoncode.i"
+        "${SWIG_OPENMM_DIR}/swig_lib/python/typemaps.i"
+        "${SWIG_OPENMM_DIR}/swig_lib/python/pythonprepend_all.i"
+    )
+    # Create input files for swig
+    add_custom_command(
+        OUTPUT ${SWIG_INPUT_FILES_REF}
+        COMMAND ${PYTHON_EXECUTABLE} "${SWIG_OPENMM_DIR}/swigInputBuilder.py"
+            -i OpenMM_headers.xml
+            -c swigInputConfig.py
+            -d OpenMM_docstring.i
+            -o OpenMM_headers.i
+            -a swig_lib/python/pythonprepend.i
+            -z swig_lib/python/pythonappend.i
+        WORKING_DIRECTORY "${SWIG_OPENMM_DIR}"
+        DEPENDS 
+            "${SWIG_OPENMM_DIR}/swigInputConfig.py"
+            "${SWIG_OPENMM_DIR}/swigInputBuilder.py"
+            "${SWIG_OPENMM_DIR}/OpenMM_headers.xml"
+        COMMENT "Creating PyOpenMM reference platform swig input files..."
+    )
+    #~ swig -python -c++ \
+    #~      -outdir $PYTHON_PACKAGE_DIR \
+    #~      -o OpenMMSwig.cxx \
+    #~      OpenMM.i
+    # Run swig
+    add_custom_command(
+        OUTPUT "${SWIG_OPENMM_DIR}/OpenMMSwig.cxx" "${OPENMM_PYTHON_STAGING_DIR}/simtk/chem/openmm/openmm.py"
+        COMMAND ${SWIG_EXECUTABLE} 
+            -python -c++ 
+            -outdir "${OPENMM_PYTHON_STAGING_DIR}/simtk/chem/openmm"
+            -o OpenMMSwig.cxx 
+            OpenMM.i
+        WORKING_DIRECTORY "${SWIG_OPENMM_DIR}"
+        DEPENDS 
+            "${SWIG_OPENMM_DIR}/OpenMM.i"
+            ${SWIG_INPUT_FILES_REF}
+            ${SWIG_INPUT_FILES2}
+        COMMENT "Creating PyOpenMM module sources with swig..."
+    )
+    add_custom_target(RunSwig DEPENDS 
+        "${SWIG_OPENMM_DIR}/OpenMMSwig.cxx"
+        "${OPENMM_PYTHON_STAGING_DIR}/simtk/chem/openmm/openmm.py")
+    set (STAGING_OUTPUT_FILES ${STAGING_OUTPUT_FILES}
+        "${OPENMM_PYTHON_STAGING_DIR}/src/swig_doxygen/OpenMMSwig.cxx"
+        "${OPENMM_PYTHON_STAGING_DIR}/simtk/chem/openmm/openmm.py")
+else(OPENMM_PYTHON_BUILD_SWIG)
+    add_custom_target(RunSwig)
+endif(OPENMM_PYTHON_BUILD_SWIG)
+##################################################################################################
+### Make a list of all folders containing include files the wrappers must be compiled against. ###
+##################################################################################################
+SET(WRAPPER_BASE_SUBDIRS . openmmapi olla serialization plugins/amoeba/openmmapi plugins/freeEnergy/openmmapi)
+SET(WRAPPER_INCLUDE_DIRS) # start empty
+FOREACH(subdir ${WRAPPER_BASE_SUBDIRS})
+    # append
+    SET(WRAPPER_INCLUDE_DIRS ${WRAPPER_INCLUDE_DIRS}
+                         ${CMAKE_SOURCE_DIR}/${subdir}/include
+                         ${CMAKE_SOURCE_DIR}/${subdir}/include/openmm
+                         ${CMAKE_SOURCE_DIR}/${subdir}/include/openmm/internal)
+ENDFOREACH(subdir)
+###########################################################################
+### Run python setup.py indirectly, so we can set environment variables ###
+###########################################################################
+set(PYTHON_SETUP_COMMAND build)
+configure_file(
+    pysetup.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/pysetupbuild.cmake"
+    @ONLY
+)
+add_custom_command(
+    OUTPUT ${OPENMM_PYTHON_STAGING_DIR}/build
+    COMMAND ${CMAKE_COMMAND}
+    ARGS -P "${CMAKE_CURRENT_BINARY_DIR}/pysetupbuild.cmake"
+    DEPENDS 
+        ${OPENMM_PYTHON_STAGING_DIR}/setup.py
+        "${CMAKE_CURRENT_BINARY_DIR}/pysetupbuild.cmake"
+        ${SHARED_TARGET}
+        ${STAGING_OUTPUT_FILES}
+    WORKING_DIRECTORY ${OPENMM_PYTHON_STAGING_DIR}
+    COMMENT "Building PyOpenMM binary module..."
+)
+add_custom_target(BuildModule ALL DEPENDS ${STAGING_OUTPUT_FILES})
+# Binary distribution
+if(WIN32)
+    set(PYTHON_SETUP_COMMAND bdist_wininst)
+else(WIN32)
+    set(PYTHON_SETUP_COMMAND bdist)
+endif(WIN32)
+configure_file(pysetup.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/pysetupbdist.cmake" @ONLY)
+add_custom_target(PythonBdist
+    COMMAND ${CMAKE_COMMAND}
+        -P "${CMAKE_CURRENT_BINARY_DIR}/pysetupbdist.cmake"
+    DEPENDS ${STAGING_OUTPUT_FILES} "${CMAKE_CURRENT_BINARY_DIR}/pysetupbdist.cmake"
+    WORKING_DIRECTORY ${OPENMM_PYTHON_STAGING_DIR}
+    COMMENT "Packaging binary distribution package (bdist)..."
+)
+# Source distribution
+set(PYTHON_SETUP_COMMAND sdist)
+configure_file(pysetup.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/pysetupsdist.cmake" @ONLY)
+add_custom_target(PythonSdist
+    COMMAND ${CMAKE_COMMAND}
+        -P "${CMAKE_CURRENT_BINARY_DIR}/pysetupsdist.cmake"
+    DEPENDS ${STAGING_OUTPUT_FILES} "${CMAKE_CURRENT_BINARY_DIR}/pysetupsdist.cmake"
+    WORKING_DIRECTORY ${OPENMM_PYTHON_STAGING_DIR}
+    COMMENT "Packaging source distribution package (sdist)..."
+)
+# Install binary module (to system location)
+set(PYTHON_SETUP_COMMAND "install")
+configure_file(pysetup.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/pysetupinstall.cmake" @ONLY)
+add_custom_target(PythonInstall
+    COMMAND ${CMAKE_COMMAND}
+        -P "${CMAKE_CURRENT_BINARY_DIR}/pysetupinstall.cmake"
+    DEPENDS ${STAGING_OUTPUT_FILES} ${OPENMM_PYTHON_STAGING_DIR}/build "${CMAKE_CURRENT_BINARY_DIR}/pysetupinstall.cmake"
+    WORKING_DIRECTORY ${OPENMM_PYTHON_STAGING_DIR}
+    COMMENT "Installing PyOpenMM binary module..."
+)
--- a/wrappers/python/MANIFEST.in
+++ b/wrappers/python/MANIFEST.in
+include setup.py
+include *.py
+include *.txt
+include doc/*.pdf
+include images/*.bmp
+include images/*.png
+global-include README
+recursive-include simtk     *.txt *.py
+recursive-include OpenMM    *.txt *.py *.so *.dll *.lib *.dylib *.h
+recursive-include examples  *.txt *.py *.pdb *.top *.prmtop *.crd *.sh *.leap
+recursive-include test      *.txt *.py *.pdb *.top *.prmtop *.crd *.sh *.in *log
+recursive-include scripts   *.txt *.py
+recursive-include src       *.txt *.py *.i *.c *.cxx *.h *.sh Doxyfile
+prune src/swig_doxygen/doxygen/html
+prune src/swig_doxygen/doxygen/xml
+global-exclude CMakeLists.txt
--- a/wrappers/python/README.txt
+++ b/wrappers/python/README.txt
+===========================================
+ PyOpenMM: Python wrappers for OpenMM
+===========================================
+URL: https://simtk.org/home/pyopenmm
+PyOpenMM is a python API that allows access to OpenMM, which is a library
+that provides tools for performing GPU accelerated molecular simulations.
+See the OpenMM project home page for more details:
+https://simtk.org/home/openmm
+Note that you do *not* need to download the OpenMM package.  This
+package includes all requried OpenMM libraries for Windows, Mac OS X,
+Linux, and 64 bit Linux. However, if you wish to make use of the
+GPU acceleration, you will need to have a supported GPU, and you will
+need to install the associated CUDA Toolkit and drivers.
+INTENDED AUDIENCE:
+This README is intended for people who downloaded the PyOpenMM package
+from the simtk.org website.
+ADVANCED USERS:
+if you are building or installing your own OpenMM libraries, you will also
+need to rebuild the python wrappers.  Note that most users will not
+need (or want) to do this.  If you really do need to rebuild the python
+wrappers, change to the following subdirectory and read its README.txt file,
+then return here to finish the installation:
+cd src/swig_doxygen
+REQUIREMENTS
+1) Python 2.6 (Pythons 2.4 and 2.5 no longer supported; Python 2.7 might work)
+2) One of the OS types supported by OpenMM:
+  a) Windows XP or better
+  b) Mac Leopard
+  c) Snow Leopard, assuming 32-bit python. See the README_MAC_64bit.txt file.
+  d) Linux (we test using CentOS 5, but others also should work)
+  e) Linux64 (we test using CentOS 5, but others should work)
+3) A C/C++ compiler.
+  a) For Windows, we suggest Visual Studio 2008
+  b) For Mac Leopard and Snow Leopard, you may need to install Apple's Xcode
+     development environment (this will install otool and install_name_tool
+     which might also be needed).
+  c) For Linux, we use gcc-c++ 4.1
+INSTALL
+First unzip the package, change to the new directory, and run
+the following two commands from a command line:
+ python setup.py build
+ python setup.py install
+TEST INSTALL
+Next run the following test to see if the install worked (it
+should report "OK"):
+ python test/test_openmm.py
+This should return "OK"
+USING A GPU
+If you would like to make use of OpenMM's GPU acceleration, you
+will have to have one of the supported GPU's, and you will need
+to install the Cuda libraries.  To download the Cuda libraries,
+check the NVIDIA website (try
+http://www.nvidia.com/object/cuda_get.html).
+For more help, see the OpenMM discussion forums at the following URL:
+https://simtk.org/forum/?group_id=161)
+Once the Cuda librareis are installed, python may need help finding
+them.  One easy way to do this on Unix type machines is to set the
+LD_LIBRARY_PATH to point to the Cuda installation.
+On my Bash system, I could do the following at the command line:
+ export LD_LIBRARY_PATH=/usr/local/cuda/lib
+On a windows machine, adding the Cuda installation path to
+your system PATH variable should work.
+After installing you may need to reboot.
+TEST GPU
+If you have a GPU, run the following to see if PyOpenMM is accessing it:
+ python scripts/pluginLoadingCheck.py
+If you do not have a GPU, or it is not found, you should get the following:
+ OpenMM found no plugins
+If you have a GPU and it's found, you will see a list of GPU libraries that
+have been loaded.  For example, on my system I see the following:
+ OpenMM loaded the following plugin(s)
+ $PYTHONPATH/simtk/chem/OpenMM/plugins/libOpenMMCuda.so
+If you are unable to load the GPU (Cuda) plugins, check that you installed
+the Cuda drivers and Toolkit correctly.
+PYOPENMM USAGE EXAMPLES
+Once you have tested the installation, switch to the example
+directory (cd examples), and try running one of the simulations.
+For example, run the argon simulation by changing to the examples/argon
+directory and typing the following:
+ python runArgon.py argon.pdb
+If all goes well, this will produce a PDB formatted file called argon.pdb,
+which can be visualized using a program such as VMD.
+FEEDBACK
+Please address all comments, criticisms, suggestions, etc to one of us:
+Mark Friedrichs at friedrim@stanford.edu
+Peter Eastman at cmbruns@stanford.edu 
+Randy Radmer at radmer@stanford.edu 
--- a/wrappers/python/pysetup.cmake.in
+++ b/wrappers/python/pysetup.cmake.in
+set(ENV{OPENMM_INCLUDE_PATH} "@WRAPPER_INCLUDE_DIRS@")
+file(TO_NATIVE_PATH "@CMAKE_BINARY_DIR@" OPENMM_LIB_PATH)
+set(ENV{OPENMM_LIB_PATH} "${OPENMM_LIB_PATH}")
+message("OPENMM_LIB_PATH = " $ENV{OPENMM_LIB_PATH})
+message("OPENMM_INCLUDE_PATH = " $ENV{OPENMM_INCLUDE_PATH})
+execute_process(
+    COMMAND "@PYTHON_EXECUTABLE@" setup.py @PYTHON_SETUP_COMMAND@
+    WORKING_DIRECTORY "@PYTHON_PACKAGE_DIR@"
+)
--- a/wrappers/python/setup.py
+++ b/wrappers/python/setup.py
+#
+"""
+setup.py: Used for building python wrappers for Simbios' OpenMM library.
+"""
+__author__ = "Randall J. Radmer"
+__version__ = "1.0"
+import os, sys, platform, glob, shutil
+import struct
+from distutils.core import setup
+MAJOR_VERSION_NUM='3'
+MINOR_VERSION_NUM='0'
+BUILD_INFO='0'
+def reportError(message):
+    sys.stdout.write("ERROR: ")
+    sys.stdout.write(message)
+    sys.stdout.write("\nExiting\n")
+    sys.exit(1)
+def removeRecursive(dir):
+    for file in os.listdir(dir):
+        path = os.path.join(dir, file)
+        if os.path.isdir(path):
+            removeRecursive(path)
+        else:
+            os.remove(path)
+    os.rmdir(dir)
+def removePackage(mod, verbose):
+        try:
+            pathList = mod.__path__
+        except AttributeError:
+            return
+        if len(pathList) > 1:
+           raise Exception("more than one item in simtk.__path__")
+        simtkInstallPath = pathList[0]
+        if os.path.exists(simtkInstallPath):
+            if verbose:
+                sys.stdout.write('REMOVING "%s"\n' % simtkInstallPath)
+            removeRecursive(simtkInstallPath)
+def uninstall(verbose=True):
+    save_path=sys.path[:]
+    sys.path=[]
+    for item in save_path:
+        if item!='.' and item!=os.getcwd():
+            sys.path.append(item)
+    try:
+        import simtk.chem.openmm as openmm
+        removePackage(openmm, verbose)
+    except ImportError:
+        pass
+    try:
+        import simtk.unit as unit
+        removePackage(unit, verbose)
+    except ImportError:
+        pass
+    sys.path=save_path
+def buildKeywordDictionary(major_version_num=MAJOR_VERSION_NUM,
+                           minor_version_num=MINOR_VERSION_NUM,
+                           build_info=BUILD_INFO):
+    from distutils.core import Extension
+    setupKeywords = {}
+    setupKeywords["name"]              = "OpenMM"
+    setupKeywords["version"]           = "%s.%s.%s" % (major_version_num,
+                                                       minor_version_num,
+                                                       build_info)
+    setupKeywords["author"]            = "Randall J. Radmer"
+    setupKeywords["author_email"]      = "radmer@stanford.edu"
+    setupKeywords["license"]           = \
+    "Python Software Foundation License (BSD-like)"
+    setupKeywords["url"]               = "https://simtk.org/home/openmm"
+    setupKeywords["download_url"]      = "https://simtk.org/home/openmm"
+    setupKeywords["packages"]          = ["simtk",
+                                          "simtk.unit",
+                                          "simtk.chem",
+                                          "simtk.chem.openmm"]
+    setupKeywords["data_files"]        = []
+    setupKeywords["package_data"]      = {"simtk" : [],
+                                          "simtk.unit" : [],
+                                          "simtk.chem" : [],
+                                          "simtk.chem.openmm" : []}
+    setupKeywords["platforms"]         = ["Linux", "Mac OS X", "Windows"]
+    setupKeywords["description"]       = \
+    "Python wrapper for OpenMM (a C++ MD package)"
+    setupKeywords["long_description"]  = \
+    """OpenMM is a library which provides tools for modern molecular
+    modeling simulation. As a library it can be hooked into any code,
+    allowing that code to do molecular modeling with minimal extra
+    coding (https://simtk.org/home/openmm).  This Python package
+    gives access to the OpenMM API.
+    """
+    define_macros = [('MAJOR_VERSION', major_version_num),
+                     ('MINOR_VERSION', minor_version_num)]
+    libraries=['OpenMM',
+               'OpenMMSerialization', 
+               'OpenMMFreeEnergy',
+               'OpenMMAmoeba',
+              ]
+    if 'OPENMM_USE_DEBUG_LIBS' in os.environ:
+        if platform.system() == "Windows":
+            raise Exception("use of OpenMM debug libs not supported on Win OS")
+        else:
+            sys.stdout.write("WARNING: using debug libs:\n")
+            for ii in range(len(libraries)):
+                libraries[ii]="%s_d" % libraries[ii]
+                sys.stdout.write("%s\n" % libraries[ii])
+    openmm_include_path = os.getenv('OPENMM_INCLUDE_PATH')
+    if not openmm_include_path:
+        reportError("Set OPENMM_INCLUDE_PATH to point to the include directory for OpenMM")
+    openmm_lib_path = os.getenv('OPENMM_LIB_PATH')
+    if not openmm_lib_path:
+        reportError("Set OPENMM_LIB_PATH to point to the lib directory for OpenMM")
+    runtime_library_dirs=[]
+    extra_compile_args=[]
+    extra_link_args=[]
+    if platform.system() == "Windows":
+        libPrefix = ""
+        libExtList = ["dll", "lib"]
+        libExtPython = "pyd"
+        define_macros.append( ('WIN32', None) )
+        define_macros.append( ('_WINDOWS', None) )
+        define_macros.append( (' _MSC_VER', None) )
+        extra_compile_args.append('/EHsc')
+    else:
+        if platform.system() == 'Darwin':
+            macVersion = [int(x) for x in platform.mac_ver()[0].split('.')]
+            if tuple(macVersion) < (10, 6):
+                os.environ['MACOSX_DEPLOYMENT_TARGET']='10.5'
+            extra_compile_args.append("-m32")
+            extra_link_args.append('-Wl,-rpath,@loader_path/OpenMM')
+            libPrefix = "lib"
+            libExtList = ["dylib"]
+            libExtPython = "so"
+        else:
+            runtime_library_dirs.append('$ORIGIN/OpenMM')
+            libPrefix = "lib"
+            libExtList = ["so"]
+            libExtPython = "so"
+    library_dirs=[openmm_lib_path]
+    include_dirs=openmm_include_path.split(';')
+    setupKeywords["ext_modules"] = [
+       Extension(name = "simtk.chem.openmm._openmm",
+                 sources = ["src/swig_doxygen/OpenMMSwig.cxx"],
+                 include_dirs = include_dirs,
+                 define_macros = define_macros,
+                 library_dirs = library_dirs,
+                 libraries = libraries,
+                 extra_compile_args=extra_compile_args,
+                 extra_link_args=extra_link_args,
+                 )
+    ]
+    outputString = ''
+    firstTab     = 40
+    secondTab    = 60
+    for key in sorted( setupKeywords.iterkeys() ):
+         value         = setupKeywords[key]
+         outputString += key.rjust(firstTab) + str( value ).rjust(secondTab) + "\n"
+    print "%s" % outputString
+    return setupKeywords
+def main():
+    if sys.version_info < (2, 6):
+        reportError("OpenMM requires Python 2.6 or better.")
+    if sys.version_info >= (3,):
+        reportError("OpenMM has not been tested with Python 3.0 or higher.")
+    if platform.system() == 'Darwin':
+        macVersion = [int(x) for x in platform.mac_ver()[0].split('.')]
+        if tuple(macVersion) < (10, 5):
+            reportError("OpenMM requires Mac OS X Leopard (10.5) or better.")
+    uninstall()
+    setupKeywords=buildKeywordDictionary()
+    setup(**setupKeywords)
+if __name__ == '__main__':
+    main()
--- a/wrappers/python/simtk/__init__.py
+++ b/wrappers/python/simtk/__init__.py
--- a/wrappers/python/simtk/chem/__init__.py
+++ b/wrappers/python/simtk/chem/__init__.py
--- a/wrappers/python/simtk/chem/element.py
+++ b/wrappers/python/simtk/chem/element.py
+#!/bin/env python
+"""
+element.py: Used for managing elements.
+"""
+__author__ = "Christopher M. Bruns"
+__version__ = "1.0"
+from simtk.unit import daltons
+class Element:
+    elements_by_symbol = {}
+    def __init__(self, number, name, symbol, mass):
+        self.atomic_number = number
+        self.name = name
+        self.symbol = symbol
+        self.mass = mass
+        # Index this element in a global table
+        s = symbol.strip().upper()
+        assert s not in Element.elements_by_symbol
+        Element.elements_by_symbol[s] = self
+def get_by_symbol(symbol):
+    s = symbol.strip().upper()
+    return Element.elements_by_symbol[s]
+hydrogen =       Element(  1, "hydrogen", "H", 1.007947*daltons)
+deuterium =      Element(  1, "deuterium", "D", 2.01355321270*daltons)
+helium =         Element(  2, "helium", "He", 4.003*daltons)
+lithium =        Element(  3, "lithium", "Li", 6.9412*daltons)
+beryllium =      Element(  4, "beryllium", "Be", 9.0121823*daltons)
+boron =          Element(  5, "boron", "B", 10.8117*daltons)
+carbon =         Element(  6, "carbon", "C", 12.01078*daltons)
+nitrogen =       Element(  7, "nitrogen", "N", 14.00672*daltons)
+oxygen =         Element(  8, "oxygen", "O", 15.99943*daltons)
+fluorine =       Element(  9, "fluorine", "F", 18.99840325*daltons)
+neon =           Element( 10, "neon", "Ne", 20.17976*daltons)
+sodium =         Element( 11, "sodium", "Na", 22.989769282*daltons)
+magnesium =      Element( 12, "magnesium", "Mg", 24.30506*daltons)
+aluminum =       Element( 13, "aluminum", "Al", 26.98153868*daltons)
+silicon =        Element( 14, "silicon", "Si", 28.08553*daltons)
+phosphorus =     Element( 15, "phosphorus", "P", 30.9737622*daltons)
+sulfur =         Element( 16, "sulfur", "S", 32.0655*daltons)
+chlorine =       Element( 17, "chlorine", "Cl", 35.4532*daltons)
+argon =          Element( 18, "argon", "Ar", 39.9481*daltons)
+potassium =      Element( 19, "potassium", "K", 39.09831*daltons)
+calcium =        Element( 20, "calcium", "Ca", 40.0784*daltons)
+scandium =       Element( 21, "scandium", "Sc", 44.9559126*daltons)
+titanium =       Element( 22, "titanium", "Ti", 47.8671*daltons)
+vanadium =       Element( 23, "vanadium", "V", 50.94151*daltons)
+chromium =       Element( 24, "chromium", "Cr", 51.99616*daltons)
+manganese =      Element( 25, "manganese", "Mn", 54.9380455*daltons)
+iron =           Element( 26, "iron", "Fe", 55.8452*daltons)
+cobalt =         Element( 27, "cobalt", "Co", 58.9331955*daltons)
+nickel =         Element( 28, "nickel", "Ni", 58.69342*daltons)
+copper =         Element( 29, "copper", "Cu", 63.5463*daltons)
+zinc =           Element( 30, "zinc", "Zn", 65.4094*daltons)
+gallium =        Element( 31, "gallium", "Ga", 69.7231*daltons)
+germanium =      Element( 32, "germanium", "Ge", 72.641*daltons)
+arsenic =        Element( 33, "arsenic", "As", 74.921602*daltons)
+selenium =       Element( 34, "selenium", "Se", 78.963*daltons)
+bromine =        Element( 35, "bromine", "Br", 79.9041*daltons)
+krypton =        Element( 36, "krypton", "Kr", 83.7982*daltons)
+rubidium =       Element( 37, "rubidium", "Rb", 85.46783*daltons)
+strontium =      Element( 38, "strontium", "Sr", 87.621*daltons)
+yttrium =        Element( 39, "yttrium", "Y", 88.905852*daltons)
+zirconium =      Element( 40, "zirconium", "Zr", 91.2242*daltons)
+niobium =        Element( 41, "niobium", "Nb", 92.906382*daltons)
+molybdenum =     Element( 42, "molybdenum", "Mo", 95.942*daltons)
+technetium =     Element( 43, "technetium", "Tc", 98*daltons)
+ruthenium =      Element( 44, "ruthenium", "Ru", 101.072*daltons)
+rhodium =        Element( 45, "rhodium", "Rh", 102.905502*daltons)
+palladium =      Element( 46, "palladium", "Pd", 106.421*daltons)
+silver =         Element( 47, "silver", "Ag", 107.86822*daltons)
+cadmium =        Element( 48, "cadmium", "Cd", 112.4118*daltons)
+indium =         Element( 49, "indium", "In", 114.8183*daltons)
+tin =            Element( 50, "tin", "Sn", 118.7107*daltons)
+antimony =       Element( 51, "antimony", "Sb", 121.7601*daltons)
+tellurium =      Element( 52, "tellurium", "Te", 127.603*daltons)
+iodine =         Element( 53, "iodine", "I", 126.904473*daltons)
+xenon =          Element( 54, "xenon", "Xe", 131.2936*daltons)
+cesium =         Element( 55, "cesium", "Cs", 132.90545192*daltons)
+barium =         Element( 56, "barium", "Ba", 137.3277*daltons)
+lanthanum =      Element( 57, "lanthanum", "La", 138.905477*daltons)
+cerium =         Element( 58, "cerium", "Ce", 140.1161*daltons)
+praseodymium =   Element( 59, "praseodymium", "Pr", 140.907652*daltons)
+neodymium =      Element( 60, "neodymium", "Nd", 144.2423*daltons)
+promethium =     Element( 61, "promethium", "Pm", 145*daltons)
+samarium =       Element( 62, "samarium", "Sm", 150.362*daltons)
+europium =       Element( 63, "europium", "Eu", 151.9641*daltons)
+gadolinium =     Element( 64, "gadolinium", "Gd", 157.253*daltons)
+terbium =        Element( 65, "terbium", "Tb", 158.925352*daltons)
+dysprosium =     Element( 66, "dysprosium", "Dy", 162.5001*daltons)
+holmium =        Element( 67, "holmium", "Ho", 164.930322*daltons)
+erbium =         Element( 68, "erbium", "Er", 167.2593*daltons)
+thulium =        Element( 69, "thulium", "Tm", 168.934212*daltons)
+ytterbium =      Element( 70, "ytterbium", "Yb", 173.043*daltons)
+lutetium =       Element( 71, "lutetium", "Lu", 174.9671*daltons)
+hafnium =        Element( 72, "hafnium", "Hf", 178.492*daltons)
+tantalum =       Element( 73, "tantalum", "Ta", 180.947882*daltons)
+tungsten =       Element( 74, "tungsten", "W", 183.841*daltons)
+rhenium =        Element( 75, "rhenium", "Re", 186.2071*daltons)
+osmium =         Element( 76, "osmium", "Os", 190.233*daltons)
+iridium =        Element( 77, "iridium", "Ir", 192.2173*daltons)
+platinum =       Element( 78, "platinum", "Pt", 195.0849*daltons)
+gold =           Element( 79, "gold", "Au", 196.9665694*daltons)
+mercury =        Element( 80, "mercury", "Hg", 200.592*daltons)
+thallium =       Element( 81, "thallium", "Tl", 204.38332*daltons)
+lead =           Element( 82, "lead", "Pb", 207.21*daltons)
+bismuth =        Element( 83, "bismuth", "Bi", 208.980401*daltons)
+polonium =       Element( 84, "polonium", "Po", 209*daltons)
+astatine =       Element( 85, "astatine", "At", 210*daltons)
+radon =          Element( 86, "radon", "Rn", 222.018*daltons)
+francium =       Element( 87, "francium", "Fr", 223*daltons)
+radium =         Element( 88, "radium", "Ra", 226*daltons)
+actinium =       Element( 89, "actinium", "Ac", 227*daltons)
+thorium =        Element( 90, "thorium", "Th", 232.038062*daltons)
+protactinium =   Element( 91, "protactinium", "Pa", 231.035882*daltons)
+uranium =        Element( 92, "uranium", "U", 238.028913*daltons)
+neptunium =      Element( 93, "neptunium", "Np", 237*daltons)
+plutonium =      Element( 94, "plutonium", "Pu", 244*daltons)
+americium =      Element( 95, "americium", "Am", 243*daltons)
+curium =         Element( 96, "curium", "Cm", 247*daltons)
+berkelium =      Element( 97, "berkelium", "Bk", 247*daltons)
+californium =    Element( 98, "californium", "Cf", 251*daltons)
+einsteinium =    Element( 99, "einsteinium", "Es", 252*daltons)
+fermium =        Element(100, "fermium", "Fm", 257*daltons)
+mendelevium =    Element(101, "mendelevium", "Md", 258*daltons)
+nobelium =       Element(102, "nobelium", "No", 259*daltons)
+lawrencium =     Element(103, "lawrencium",     "Lr", 262*daltons)
+rutherfordium =  Element(104, "rutherfordium",  "Rf", 261*daltons)
+dubnium =        Element(105, "dubnium",        "Db", 262*daltons)
+seaborgium =     Element(106, "seaborgium",     "Sg", 266*daltons)
+bohrium =        Element(107, "bohrium",        "Bh", 264*daltons)
+hassium =        Element(108, "hassium",        "Hs", 269*daltons)
+meitnerium =     Element(109, "meitnerium",     "Mt", 268*daltons)
+darmstadtium =   Element(110, "darmstadtium",   "Ds", 281*daltons)
+roentgenium =    Element(111, "roentgenium",    "Rg", 272*daltons)
+ununbium =       Element(112, "ununbium",       "Uub", 285*daltons)
+ununtrium =      Element(113, "ununtrium",      "Uut", 284*daltons)
+ununquadium =    Element(114, "ununquadium",    "Uuq", 289*daltons)
+ununpentium =    Element(115, "ununpentium",    "Uup", 288*daltons)
+ununhexium =     Element(116, "ununhexium",     "Uuh", 292*daltons)
--- a/wrappers/python/simtk/chem/openmm/__init__.py
+++ b/wrappers/python/simtk/chem/openmm/__init__.py
+#
+#
+#
+"""
+Package simtk.chem.openmm
+This package wraps the simtk.chem.openmm.openmm module.
+When imported, it loads the swig module and then does some magic
+to make the POSIX function "dlopen" work on Linux.
+It also tries to load any plugin modules it can find.
+"""
+__author__ = "Randall J. Radmer"
+__version__ = "1.0"
+import os, sys, glob
+if sys.platform == "win32":
+    libPrefix=""
+    libExt="dll"
+elif sys.platform == 'darwin':
+    libPrefix="lib"
+    libExt="dylib"
+else:
+    libPrefix="lib"
+    libExt="so"
+    # The following is an evil incantation that is needed to permit
+    # the POSIX "dlopen" function to work.  I do not understand
+    # it.  If a better solution is known, please forward to the
+    # PyOpenMM code maintainers.
+    import ctypes
+    flags = sys.getdlopenflags()
+    sys.setdlopenflags(flags | ctypes.RTLD_GLOBAL)
+import simtk.chem
+from simtk.chem.openmm.openmm import *
+skipPluginFilenames=["OpenMMFreeEnergy"]
+if len(simtk.chem.__path__) > 1:
+   raise Exception("more than one item in simtk.chem.openmm.__path__")
+pluginPath = os.path.join(simtk.chem.__path__[0],
+                          'openmm',
+                          'OpenMM',
+                          'plugins')
+pluginLoadingErrors={}
+pluginLoadedLibNames=[]
+libFilenames=glob.glob(os.path.join(pluginPath, "*.%s" % (libExt)))
+# Load plugins
+for filename in libFilenames:
+    skipPlugin=False
+    for pFilename in skipPluginFilenames:
+        fullFilename = "%s%s.%s" % (libPrefix, pFilename, libExt)
+        if os.path.split(filename)[-1] == fullFilename:
+            skipPlugin=True
+            break
+    if skipPlugin: continue
+    try:
+        Platform.loadPluginLibrary(os.path.join(pluginPath, filename))
+        pluginLoadedLibNames.append(filename)
+    except:
+        pluginLoadingErrors[filename]=sys.exc_info()
--- a/wrappers/python/simtk/chem/openmm/openmm.py
+++ b/wrappers/python/simtk/chem/openmm/openmm.py
--- a/wrappers/python/simtk/chem/pdbstructure.py
+++ b/wrappers/python/simtk/chem/pdbstructure.py