web version built with WASM #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

BSVogler wants to merge 65 commits into molovol:master from BSVogler:wasm

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ _site/ @@
     .idea/
     *.pyc
+    webserver/molovol_wasm.*
     # Virtual python environment
     venv*/
@@ Expand All / @@ -61,3 +62,6 @@ external/VTK/build* @@
     external/VTK/out/build*
     notforcommit/
+    webserver/static/molovol_wasm.data
+    webserver/static/molovol_wasm.js
+    webserver/static/molovol_wasm.wasm

CMakeLists.txt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -17,7 +17,7 @@ endif()
  
    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11 CACHE STRING "Minimum macOS deployment version" FORCE)

    # Set name and version

    project(MoloVol VERSION 1.2.0)

    project(MoloVol VERSION 1.2.1)

    if(NOT APPLE)

      # Strip binary for release build

    @@ -27,25 +27,54 @@ endif()
  
    include(ExecutableName)

    # EXE_NAME

    if(EMSCRIPTEN)

        set(EXE_NAME molovol_wasm)

    endif()

    # Specify C++ standard

    set(CMAKE_CXX_STANDARD 20)

    set(CMAKE_CXX_STANDARD_REQUIRED True)

    set(CMAKE_CXX_STANDARD_REQUIRED ON)

    set(CMAKE_CXX_EXTENSIONS OFF)

    set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

    # wxWidgets

    set(wxWidgets_USE_STATIC=ON)

    # Not ideal to use these absolute paths here

    if (MSVC)

      set(wxWidgets_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/wxWidgets")

      set(wxWidgets_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/wxWidgets/lib/vc_x64_lib-x64-Release-MT")

    find_program(CCACHE_PROGRAM ccache)

    if(CCACHE_PROGRAM)

        set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")

    endif()

    find_package(wxWidgets REQUIRED core base gl OPTIONAL_COMPONENTS net)

    include(${wxWidgets_USE_FILE})

    if(APPLE)

        if(CMAKE_C_COMPILER_ID MATCHES "Clang")

            set(OpenMP_C_FLAGS "-Xpreprocessor -fopenmp")

            set(OpenMP_C_LIB_NAMES "omp")

            set(OpenMP_omp_LIBRARY /opt/homebrew/opt/libomp/lib/libomp.dylib)

        endif()

        if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")

            set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp")

            set(OpenMP_CXX_LIB_NAMES "omp")

            set(OpenMP_omp_LIBRARY /opt/homebrew/opt/libomp/lib/libomp.dylib)

        endif()

    endif()

    #find_package(OpenMP)

    if(MOLOVOL_RENDERER)

      include(VTKRenderer)

    # wxWidgets

    if(MOLOVOL_BUILD_GUI)

      set(wxWidgets_USE_STATIC=ON)

      # Not ideal to use these absolute paths here

      if (MSVC)

        set(wxWidgets_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/wxWidgets")

        set(wxWidgets_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/wxWidgets/lib/vc_x64_lib-x64-Release-MT")

      endif()

      if(MOLOVOL_RENDERER)

        find_package(wxWidgets REQUIRED core base gl OPTIONAL_COMPONENTS net)

      else()

        find_package(wxWidgets REQUIRED core base OPTIONAL_COMPONENTS net)

      endif()

      include(${wxWidgets_USE_FILE})

      if(MOLOVOL_RENDERER)

        include(VTKRenderer)

      endif()

    endif()

    # Add include path, so that header files can be found

    @@ -68,11 +97,10 @@ endif()
  
    include(Sources)

    # SOURCES

    if(MOLOVOL_RENDERER)

    if(MOLOVOL_RENDERER AND MOLOVOL_BUILD_GUI)

      list(APPEND SOURCES "src/render_frame.cpp")

    endif()

    include(Resources)

    # ELEM_FILE

    # SPACEGROUP_FILE

    @@ -99,45 +127,54 @@ endif()
  
    #set(CMAKE_INSTALL_RPATH "@executable_path/Frameworks")

    # Target MoloVol

    if (MSVC)

      #target_sources(${EXE_NAME} PRIVATE ${WIN_RESOURCE_FILES})

      add_executable(${EXE_NAME} WIN32 ${SOURCES} ${WIN_RESOURCE_FILES})

    if(EMSCRIPTEN)

        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/wasm.cmake)

    elseif(MSVC)

        #target_sources(${EXE_NAME} PRIVATE ${WIN_RESOURCE_FILES})

        add_executable(${EXE_NAME} WIN32 ${SOURCES} ${WIN_RESOURCE_FILES})

    else()

      add_executable(${EXE_NAME} ${SOURCES} ${OSX_RESOURCE_FILES})

        add_executable(${EXE_NAME} ${SOURCES} ${OSX_RESOURCE_FILES})

    endif()

    # XCode, app bundle and libtiff

    include(MacSpecific)

    target_link_libraries(${EXE_NAME} ${wxWidgets_LIBRARIES})

    if(MOLOVOL_RENDERER)

      target_link_libraries(${EXE_NAME} ${WXVTK_LIB})

      target_compile_definitions(${EXE_NAME} PRIVATE MOLOVOL_RENDERER) 

    target_link_libraries(${EXE_NAME} PRIVATE molovol_lib)

    if(MOLOVOL_BUILD_GUI)

      target_link_libraries(${EXE_NAME} ${wxWidgets_LIBRARIES})

      target_compile_definitions(${EXE_NAME} PRIVATE MOLOVOL_GUI)

      if(MOLOVOL_RENDERER)

        target_link_libraries(${EXE_NAME} ${WXVTK_LIB})

        target_compile_definitions(${EXE_NAME} PRIVATE MOLOVOL_RENDERER) 

      endif()

    endif()

      # Add custom flag

    if(MOLOVOL_ABS_RESOURCE_PATH)

      target_compile_definitions(${EXE_NAME} PUBLIC -DABS_PATH)

    endif()

    # Keeping this around just so I don't forget the syntax

    #  if(OpenMP_CXX_FOUND)

    #    target_link_libraries(target PUBLIC OpenMP::OpenMP_CXX)

    #  endif()

    # Tests

    if (MOLOVOL_BUILD_TESTING AND BUILD_TESTING)

      include(Testing)

    endif()

    # Installation instructions for debian package

    if (UNIX AND NOT APPLE)

      include(DebInstall)

    elseif(APPLE)

      # This is needed for generation of the dmg file

      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/MoloVol.app DESTINATION "." 

        FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

    if (NOT EMSCRIPTEN)  # Only do native installations

        if (UNIX AND NOT APPLE)

            include(DebInstall)

        elseif(APPLE)

            # This is needed for generation of the dmg file

            install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/MoloVol.app DESTINATION "." 

                FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

        endif()

    endif()

    include(Packing)

    #this openMP section is currently commented out as it leads to runtime crashed because of some memory issue

    find_package(OpenMP)

    if(OpenMP_CXX_FOUND)

        target_link_libraries(${EXE_NAME} PUBLIC OpenMP::OpenMP_CXX)

        target_compile_definitions(${EXE_NAME} PUBLIC HAVE_OPENMP)

    endif()

    # Ensure molovol_test is built if MOLOVOL_BUILD_TESTING is ON

    if(MOLOVOL_BUILD_TESTING)

        include(Testing) # Include Testing.cmake here

    endif()

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -49,7 +49,16 @@ software for your own purposes or propose changes to the developers and take par
  
    Dependencies needed for compilation:

    - Any C++ compiler

    - [wxWidgets 3.1.5](https://www.wxwidgets.org)

    - cmake

    - Optional for native GUI: [wxWidgets 3.1.5](https://www.wxwidgets.org)

    You can build without the desktop native GUI by setting it up with

    `cmake -DMOLOVOL_BUILD_GUI=0`

    You can build for wasm with set-up

    `emcmake cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DMOLOVOL_BUILD_GUI=0 ..`

    then compile with

    `emmake make`

    ### MoloVol Web

    @@ -58,7 +67,7 @@ front-end wrapping the MoloVol CLI interface. To launch, first change the FLASK_
  
    the command `export FLASK_APP=./webserver/app.py` from the project's root directory. Then execute `flask run`.

    For hosting on a web server check out the next section.

    ### Containerized application

    ### Containerized cli application

    Instead of compiling or running the binaries you can also use a containerized version (for instance using docker or 

    podman) to access the CLI or web interface.

    @@ -72,7 +81,7 @@ below with your local image name.
  
    Running a container:

    - For a short-lived container: Pass the CLI arguments in the run command:

      `docker run -it bsvogler/molovol ./launch_headless.sh <yourMolovolArguments>`

    - To run web application http://localhost:80: run 

    - To run web application http://localhost:5000: run 

      `docker run -dt --restart=always -p 5000:5000 --name molovol bsvogler/molovol`. 

      When not otherwise specified the default port of a flask instance is 5000.

cmake/DebInstall.cmake

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,10 +1,8 @@
  
    include(GNUInstallDirs)

    # Compress changelog

    # Compress changelog and man pages (needed for both GUI and non-GUI)

    set(DEB_CHANGELOG_COMPRESSED "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz")

    set(DEB_MAN_COMPRESSED "${CMAKE_CURRENT_BINARY_DIR}/molovol.1.gz")

    set(HICOLOR_DIR "${CMAKE_CURRENT_BINARY_DIR}/hicolor")

    add_custom_command(

      OUTPUT ${DEB_CHANGELOG_COMPRESSED} ${DEB_MAN_COMPRESSED}

    @@ -15,39 +13,46 @@ add_custom_command(
  
      COMMENT "Compressing changelog and manual file"

    )

    add_custom_command(

      OUTPUT ${HICOLOR_DIR}

      COMMAND bash ${DEB_RES_DIR}/shell/resize_icon ${DEB_ICON} ./

      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

      DEPENDS ${DEB_ICON}

      COMMENT "Resizing icon to supported sizes"

    )

    add_custom_target(compress ALL DEPENDS ${DEB_CHANGELOG_COMPRESSED} ${DEB_MAN_COMPRESSED})

    add_custom_target(resize_icon ALL DEPENDS ${HICOLOR_DIR})

    # 

    execute_process(COMMAND dpkg --print-architecture COMMAND tr -d '\n' OUTPUT_VARIABLE LINUX_ARCHITECTURE)

    if(MOLOVOL_BUILD_GUI)

      # GUI-specific icon processing

      set(HICOLOR_DIR "${CMAKE_CURRENT_BINARY_DIR}/hicolor")

      add_custom_command(

        OUTPUT ${HICOLOR_DIR}

        COMMAND bash ${DEB_RES_DIR}/shell/resize_icon ${DEB_ICON} ./

        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

        DEPENDS ${DEB_ICON}

        COMMENT "Resizing icon to supported sizes"

      )

      add_custom_target(resize_icon ALL DEPENDS ${HICOLOR_DIR})

    endif()

    # Set directory permissions to 0755

    # Must come before install commands

    set(

      CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS

      OWNER_READ OWNER_WRITE OWNER_EXECUTE

      GROUP_READ GROUP_EXECUTE

      WORLD_READ WORLD_EXECUTE

    )

    # Install commands so that these files get added to the deb file

    # Install commands for both GUI and non-GUI

    install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

    install(FILES ${ELEM_FILE} ${SPACEGROUP_FILE} 

      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${EXE_NAME})

    install(FILES ${DEB_COPYRIGHT_FILE} ${DEB_CHANGELOG_COMPRESSED} 

      DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/${EXE_NAME})

    install(FILES ${DEB_DESKTOP_FILE} 

      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)

    install(FILES ${DEB_MAN_COMPRESSED} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

    install(FILES ${DEB_ICON} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)

    install(DIRECTORY ${HICOLOR_DIR} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)

    install(FILES ${DEB_MAN_COMPRESSED} 

      DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

    # GUI-specific install commands

    if(MOLOVOL_BUILD_GUI)

      install(FILES ${DEB_DESKTOP_FILE} 

        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)

      install(FILES ${DEB_ICON} 

        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)

      install(DIRECTORY ${HICOLOR_DIR} 

        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons)

    endif()

cmake/MacSpecific.cmake

-Original file line number
+Diff line change
@@ -1,15 +1,20 @@
     # XCode compatibility
     set_target_properties(${EXE_NAME} PROPERTIES
       XCODE_GENERATE_SCHEME TRUE
       XCODE_SCHEME_WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
-    # macOS Bundle
-    set_target_properties(${EXE_NAME} PROPERTIES
-      MACOSX_BUNDLE_BUNDLE_NAME ${EXE_NAME}
-      MACOSX_BUNDLE_EXECUTABLE_NAME ${EXE_NAME}
-      MACOSX_BUNDLE_BUNDLE_VERSION ${CMAKE_PROJECT_VERSION}
-      MACOSX_BUNDLE_ICON_FILE icon
-    )
+    if(MOLOVOL_BUILD_GUI)
+      # macOS Bundle
+      set_target_properties(${EXE_NAME} PROPERTIES
+        MACOSX_BUNDLE_BUNDLE_NAME ${EXE_NAME}
+        MACOSX_BUNDLE_EXECUTABLE_NAME ${EXE_NAME}
+        MACOSX_BUNDLE_BUNDLE_VERSION ${CMAKE_PROJECT_VERSION}
+        MACOSX_BUNDLE_ICON_FILE icon
+      )
+      # Library shenanigans for wxWidgets
+      if(APPLE)
+        string(REPLACE "-ltiff" "/usr/local/opt/libtiff/lib/libtiff.a" wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+      endif()
+    endif()

cmake/Options.cmake

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,11 @@ if (CMAKE_MACOSX_BUNDLE AND NOT MOLOVOL_ABS_RESOURCE_PATH) @@
       set(MOLOVOL_ABS_RESOURCE_PATH TRUE)
     endif()
+    option(
+      MOLOVOL_BUILD_GUI
+      "Build MoloVol with GUI support (requires wxWidgets)"
+      ON
+    )
     option(
       MOLOVOL_RENDERER
       "Enable compilation and linking to wxVTK24"
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

web version built with WASM #145

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

web version built with WASM #145

Are you sure you want to change the base?

Uh oh!

web version built with WASM #145

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!