Merge pull request #1 from tigercosmos/console-stdout

Console stdout

Author: tychuang1211

.github/workflows/devbuild.yml

@@ -17,7 +17,6 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      JOB_MAKE_ARGS: VERBOSE=1 BUILD_QT=ON USE_CLANG_TIDY=OFF
       QT_DEBUG_PLUGINS: 1
       QT_QPA_PLATFORM: offscreen
 
@@ -80,33 +79,48 @@ jobs:
         echo "flake8 path: $(which flake8)"
         echo "flake8 version: $(flake8 --version)"
 
-    - name: make buildext
+    - name: make buildext BUILD_QT=OFF
       run: |
-        make buildext \
-          ${JOB_MAKE_ARGS} \
+        rm -f build/*/Makefile
+        make cmake \
+          VERBOSE=1 USE_CLANG_TIDY=OFF \
+          BUILD_QT=OFF \
           CMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
           CMAKE_ARGS="-DPYTHON_EXECUTABLE=$(which python3)"
+        make buildext VERBOSE=1
 
-    - name: make pytest
+    - name: make pytest BUILD_QT=OFF
       run: |
-        make pytest \
-          ${JOB_MAKE_ARGS} \
+        python3 -c "import modmesh; assert modmesh.HAS_VIEW == False"
+        make pytest VERBOSE=1
+
+    - name: make buildext BUILD_QT=ON
+      run: |
+        rm -f build/*/Makefile
+        make cmake \
+          VERBOSE=1 USE_CLANG_TIDY=OFF \
+          BUILD_QT=ON \
           CMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
           CMAKE_ARGS="-DPYTHON_EXECUTABLE=$(which python3)"
+        make buildext VERBOSE=1
+
+    - name: make pytest BUILD_QT=ON
+      run: |
+        python3 -c "import modmesh; assert modmesh.HAS_VIEW == True"
+        make pytest VERBOSE=1
 
     - name: make viewer
       run: |
+        rm -f build/*/Makefile
         make viewer \
-          ${JOB_MAKE_ARGS} \
+          VERBOSE=1 USE_CLANG_TIDY=OFF \
+          BUILD_QT=ON \
           CMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
           CMAKE_ARGS="-DPYTHON_EXECUTABLE=$(which python3)"
 
     - name: make run_viewer_pytest
       run: |
-        make run_viewer_pytest \
-          ${JOB_MAKE_ARGS} \
-          CMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
-          CMAKE_ARGS="-DPYTHON_EXECUTABLE=$(which python3)"
+        make run_viewer_pytest VERBOSE=1
 
   build_macos:
 
@@ -117,7 +131,6 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      JOB_MAKE_ARGS: VERBOSE=1 BUILD_QT=ON USE_CLANG_TIDY=OFF
       QT_DEBUG_PLUGINS: 1
 
     strategy:
@@ -180,36 +193,54 @@ jobs:
           echo "flake8 path: $(which flake8)"
           echo "flake8 version: $(flake8 --version)"
 
-      - name: make buildext
+      - name: make buildext BUILD_QT=OFF
         run: |
-          make buildext \
-            ${JOB_MAKE_ARGS} \
+          rm -f build/*/Makefile
+          make cmake \
+            VERBOSE=1 USE_CLANG_TIDY=OFF \
+            BUILD_QT=OFF \
             CMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
             CMAKE_ARGS="-DPYTHON_EXECUTABLE=$(which python3)"
+          make buildext VERBOSE=1
 
-      - name: make pytest
+      - name: make pytest BUILD_QT=OFF
         run: |
+          JOB_MAKE_ARGS="VERBOSE=1"
           if [ "${{ matrix.os }}" == "macos-12" ] ; then \
             JOB_MAKE_ARGS="${JOB_MAKE_ARGS} BUILD_METAL=ON" ; \
           fi
-          make pytest \
-            ${JOB_MAKE_ARGS} \
+          make pytest ${JOB_MAKE_ARGS}
+
+      - name: make buildext BUILD_QT=ON
+        run: |
+          rm -f build/*/Makefile
+          make cmake \
+            VERBOSE=1 USE_CLANG_TIDY=OFF \
+            BUILD_QT=ON \
             CMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
             CMAKE_ARGS="-DPYTHON_EXECUTABLE=$(which python3)"
+          make buildext VERBOSE=1
+
+      - name: make pytest BUILD_QT=ON
+        run: |
+          JOB_MAKE_ARGS="VERBOSE=1"
+          if [ "${{ matrix.os }}" == "macos-12" ] ; then \
+            JOB_MAKE_ARGS="${JOB_MAKE_ARGS} BUILD_METAL=ON" ; \
+          fi
+          make pytest ${JOB_MAKE_ARGS}
 
       - name: make viewer
         run: |
+          rm -f build/*/Makefile
           make viewer \
-            ${JOB_MAKE_ARGS} \
+            VERBOSE=1 USE_CLANG_TIDY=OFF \
+            BUILD_QT=ON \
             CMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
             CMAKE_ARGS="-DPYTHON_EXECUTABLE=$(which python3)"
 
       - name: make run_viewer_pytest
         run: |
-          make run_viewer_pytest \
-            ${JOB_MAKE_ARGS} \
-            CMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
-            CMAKE_ARGS="-DPYTHON_EXECUTABLE=$(which python3)"
+          make run_viewer_pytest VERBOSE=1
 
   build_windows:
 

.github/workflows/nouse_install.yml

@@ -81,7 +81,8 @@ jobs:
         cp -a tests tmp/
         cd tmp/
         python3 -c 'import os; print(os.getcwd())'
-        python3 -c "import modmesh; print(modmesh._modmesh.__file__)"
+        python3 -c "import modmesh; print(modmesh.__file__)"
+        python3 -c "import _modmesh; print(_modmesh.__file__)"
         pytest --rootdir=/tmp -v
         cd ..
 
@@ -163,6 +164,7 @@ jobs:
           cp -a tests tmp/
           cd tmp/
           python3 -c 'import os; print(os.getcwd())'
-          python3 -c "import modmesh; print(modmesh._modmesh.__file__)"
+          python3 -c "import modmesh; print(modmesh.__file__)"
+          python3 -c "import _modmesh; print(_modmesh.__file__)"
           pytest --rootdir=/tmp -v
           cd ..

CMakeLists.txt

@@ -47,6 +47,7 @@ include(Flake8)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Export compile commands")
 
 option(HIDE_SYMBOL "hide the symbols of python wrapper" OFF)

cpp/binary/pymod_modmesh/CMakeLists.txt

@@ -7,68 +7,39 @@ project(modmesh_pymod)
 pybind11_add_module(
     _modmesh
     module.cpp
-    ${MODMESH_PYMOD_MODMESH_HEADERS}
-    ${MODMESH_PYMOD_MODMESH_SOURCES}
-    ${MODMESH_PYMOD_ONEDIM_HEADERS}
-    ${MODMESH_PYMOD_ONEDIM_SOURCES}
-    ${MODMESH_PYMOD_SPACETIME_HEADERS}
-    ${MODMESH_PYMOD_SPACETIME_SOURCES}
-    ${MODMESH_HEADERS}
-    ${MODMESH_SOURCES}
-    ${MODMESH_ONEDIM_HEADERS}
-    ${MODMESH_ONEDIM_SOURCES}
-    ${MODMESH_SPACETIME_HEADERS}
-    ${MODMESH_SPACETIME_SOURCES}
-    ${MODMESH_PYTHON_HEADERS}
-    ${MODMESH_PYTHON_SOURCES}
 )
 
-if(APPLE)
-    find_library(APPLE_FWK_FOUNDATION Foundation REQUIRED)
-    find_library(APPLE_FWK_QUARTZ_CORE QuartzCore REQUIRED)
-    find_library(APPLE_FWK_METAL Metal REQUIRED)
-
-    target_link_libraries(
-        _modmesh PUBLIC
-        ${APPLE_FWK_FOUNDATION}
-        ${APPLE_FWK_QUARTZ_CORE}
-        ${APPLE_FWK_METAL}
-    )
-endif()
+target_link_libraries(
+    _modmesh PUBLIC
+    pybind11::module
+    modmesh_primary
+)
 
-if(HIDE_SYMBOL)
+if (HIDE_SYMBOL)
     set_target_properties(_modmesh PROPERTIES CXX_VISIBILITY_PRESET "hidden")
-else()
+else () # HIDE_SYMBOL
     set_target_properties(_modmesh PROPERTIES CXX_VISIBILITY_PRESET "default")
-endif()
+endif () # HIDE_SYMBOL
 
-if(MSVC)
-    target_compile_options(
-        _modmesh PRIVATE
-        ${COMMON_COMPILER_OPTIONS}
-    )
-else()
-    target_compile_options(
-        _modmesh PRIVATE
-        ${COMMON_COMPILER_OPTIONS}
-        -Wno-unused-value # for PYBIND11_EXPAND_SIDE_EFFECTS in pybind11.h
-        -Wno-noexcept-type # GCC
-    )
-endif()
+target_compile_options(
+    _modmesh PRIVATE
+    ${COMMON_COMPILER_OPTIONS}
+)
 
-if(CLANG_TIDY_EXE AND USE_CLANG_TIDY)
+if (CLANG_TIDY_EXE AND USE_CLANG_TIDY)
     set_target_properties(
         _modmesh PROPERTIES
         CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
     )
-endif()
+endif ()
 
 execute_process(
     COMMAND python3-config --extension-suffix
-    OUTPUT_VARIABLE PYEXTSUFFIX)
+    OUTPUT_VARIABLE PYEXTSUFFIX
+)
 
 add_custom_target(_modmesh_py
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:_modmesh> ${MODMESH_PY_DIR}/_modmesh${PYEXTSUFFIX}
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:_modmesh> ${MODMESH_PY_DIR}/../_modmesh${PYEXTSUFFIX}
     DEPENDS _modmesh)
 
 message(STATUS "CMAKE_INSTALL_INCLUDEDIR: ${CMAKE_INSTALL_INCLUDEDIR}")

cpp/binary/pymod_modmesh/module.cpp

@@ -20,17 +20,11 @@
  */
 
 #include <modmesh/python/python.hpp> // Must be the first include.
-#include <modmesh/python/wrapper/modmesh/modmesh.hpp>
-#include <modmesh/python/wrapper/onedim/onedim.hpp>
-#include <modmesh/python/wrapper/spacetime/spacetime.hpp>
+#include <modmesh/python/module.hpp>
 
 PYBIND11_MODULE(_modmesh, mod) // NOLINT
 {
-    modmesh::python::initialize_modmesh(mod);
-    pybind11::module_ spacetime_mod = mod.def_submodule("spacetime", "spacetime");
-    modmesh::python::initialize_spacetime(spacetime_mod);
-    pybind11::module_ onedim_mod = mod.def_submodule("onedim", "onedim");
-    modmesh::python::initialize_onedim(onedim_mod);
+    modmesh::python::initialize(mod);
 }
 
 // vim: set ff=unix fenc=utf8 nobomb et sw=4 ts=4 sts=4:

cpp/binary/viewer/CMakeLists.txt

@@ -6,17 +6,17 @@ project(viewer LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
 # get the root of the modmdesh project
 set(PROJECT_ROOT_DIR ${PROJECT_SOURCE_DIR}/../../../)
 
 if(NOT DEFINED INSTALL_VIEWERDIR)
     set(INSTALL_VIEWERDIR "viewer")
 endif()
 
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Gui)
@@ -28,25 +28,20 @@ find_package(Qt6 COMPONENTS 3DExtras)
 qt_add_executable(
     viewer
     viewer.cpp
-    ${MODMESH_HEADERS}
-    ${MODMESH_SOURCES}
-    ${MODMESH_VIEW_HEADERS}
-    ${MODMESH_VIEW_SOURCES}
-    ${MODMESH_ONEDIM_HEADERS}
-    ${MODMESH_ONEDIM_SOURCES}
-    ${MODMESH_SPACETIME_HEADERS}
-    ${MODMESH_SPACETIME_SOURCES}
-    ${MODMESH_PYTHON_HEADERS}
-    ${MODMESH_PYTHON_SOURCES}
-    ${MODMESH_PYMOD_MODMESH_HEADERS}
-    ${MODMESH_PYMOD_MODMESH_SOURCES}
-    ${MODMESH_PYMOD_ONEDIM_HEADERS}
-    ${MODMESH_PYMOD_ONEDIM_SOURCES}
-    ${MODMESH_PYMOD_SPACETIME_HEADERS}
-    ${MODMESH_PYMOD_SPACETIME_SOURCES}
 )
 
-add_custom_target(run_viewer_pytest $<TARGET_FILE:viewer> --mode=pytest)
+target_link_libraries(
+    viewer PUBLIC
+    pybind11::embed
+    modmesh_primary
+)
+if(WIN32)
+    set_target_properties(
+        viewer
+        PROPERTIES
+        LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE" # open the console for debug mode
+    )
+endif(WIN32)
 
 qt_add_resources(
     viewer "app_icon"
@@ -56,19 +51,6 @@ qt_add_resources(
     ${PROJECT_ROOT_DIR}/resources/viewer/icon.ico
 )
 
-if(APPLE)
-    find_library(APPLE_FWK_FOUNDATION Foundation REQUIRED)
-    find_library(APPLE_FWK_QUARTZ_CORE QuartzCore REQUIRED)
-    find_library(APPLE_FWK_METAL Metal REQUIRED)
-
-    target_link_libraries(
-        viewer PUBLIC
-        ${APPLE_FWK_FOUNDATION}
-        ${APPLE_FWK_QUARTZ_CORE}
-        ${APPLE_FWK_METAL}
-    )
-endif()
-
 if(HIDE_SYMBOL)
     set_target_properties(viewer PROPERTIES CXX_VISIBILITY_PRESET "hidden")
 else()
@@ -100,17 +82,20 @@ set_target_properties(
     MACOSX_BUNDLE TRUE
 )
 
-target_link_libraries(
-    viewer PUBLIC
-    pybind11::embed
-    Qt::Widgets
-    Qt::3DCore
-    Qt::3DExtras
-    Qt::3DInput
-    Qt::3DRender
-    Qt::Core
-    Qt::Gui
-)
+if(APPLE)
+    find_library(APPLE_FWK_FOUNDATION Foundation REQUIRED)
+    find_library(APPLE_FWK_QUARTZ_CORE QuartzCore REQUIRED)
+    find_library(APPLE_FWK_METAL Metal REQUIRED)
+
+    target_link_libraries(
+        viewer PUBLIC
+        ${APPLE_FWK_FOUNDATION}
+        ${APPLE_FWK_QUARTZ_CORE}
+        ${APPLE_FWK_METAL}
+    )
+endif()
+
+add_custom_target(run_viewer_pytest $<TARGET_FILE:viewer> --mode=pytest)
 
 install(TARGETS viewer
     RUNTIME DESTINATION "${INSTALL_VIEWERDIR}"