Merge pull request #84 from svalinn/linux_action

pshriwise · web-flow · commit 55cb839e94f1 · 2021-03-17T01:23:50.000-05:00
Cubit 2020.2 compatibility -- Linux action and scripts
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -0,0 +1,126 @@
+name: Linux
+
+on:
+  # allows us to run workflows manually
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - develop
+      - master
+  push:
+    branches:
+      - develop
+      - master
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  main:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - cubit: 17.1.0
+            os: ubuntu-18.04
+            URL: LINUX_CUBIT_17_1_0
+            URL_SDK: LINUX_CUBIT_SDK_17_1_0
+            
+          - cubit: 2020.2
+            os: ubuntu-20.04
+            URL: LINUX_CUBIT_2020_2
+            URL_SDK: LINUX_CUBIT_SDK_2020_2
+
+    name: 'Trelis/Cubit Svalinn Plugin ${{ matrix.cubit }} Build for Linux'
+
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Environment Variables
+        shell: bash -l {0}
+        run: |
+          echo "CURRENT=$(pwd)" >> $GITHUB_ENV
+          echo "SCRIPTPATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV
+          echo "PLUGIN_ABS_PATH=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV
+          echo "FOLDER_PKG=$GITHUB_WORKSPACE/../pkg" >> $GITHUB_ENV
+          echo "SUDO=sudo " >> $GITHUB_ENV
+          if [ "${{ matrix.cubit }}" = "17.1.0" ]; then
+            echo "CUBIT_PATH=/opt/Trelis-17.1" >> $GITHUB_ENV
+            echo "TRELIS_PKG=Trelis-17.1.0-Lin64.deb" >> $GITHUB_ENV
+            echo "TRELIS_SDK_PKG=Trelis-SDK-17.1.0-Lin64.tar.gz" >> $GITHUB_ENV
+            echo "CMAKE_ADDITIONAL_FLAGS=-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0" >> $GITHUB_ENV
+            echo "UBUNTU_VERSION=18" >> $GITHUB_ENV
+            echo "HDF5_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial" >> $GITHUB_ENV
+          else
+            echo "TRELIS_PKG=Coreform-Cubit-2020.2-Ubuntu20.deb" >> $GITHUB_ENV
+            echo "TRELIS_SDK_PKG=Coreform-Cubit-2020.2-Lin64-SDK.tar.gz" >> $GITHUB_ENV
+            echo "CUBIT_PATH=/opt/Coreform-Cubit-2020.2" >> $GITHUB_ENV
+            echo "UBUNTU_VERSION=20" >> $GITHUB_ENV
+            echo "HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0" >> $GITHUB_ENV
+          fi
+          echo "source $GITHUB_WORKSPACE/scripts/linux_share_build.sh" >> $HOME/.bash_profile
+      
+      - name: Initial setup
+        shell: bash -l {0}
+        run: |
+          install_prerequisites
+          setup_var ${{ matrix.cubit }}
+          echo "TRELIS_PATH=$TRELIS_PATH" >> $GITHUB_ENV
+          echo "TRELIS_PKG=$TRELIS_PKG" >> $GITHUB_ENV
+          echo "TRELIS_SDK_PKG=$TRELIS_SDK_PKG" >> $GITHUB_ENV
+          echo "CMAKE_ADDITIONAL_FLAGS=$CMAKE_ADDITIONAL_FLAGS" >> $GITHUB_ENV
+ 
+      - name: Downloading packages
+        shell: bash -l {0}
+        env:   
+          CUBIT_DEB_URL: ${{ secrets[matrix.URL] }}
+          CUBIT_SDK_URL: ${{ secrets[matrix.URL_SDK] }}
+        run: |
+          mkdir -p $FOLDER_PKG
+          cd $FOLDER_PKG
+          echo ${TRELIS_PKG}
+          curl -L https://uwmadison.box.com/shared/static/${CUBIT_DEB_URL}.deb --output ${TRELIS_PKG}
+          curl -L https://uwmadison.box.com/shared/static/${CUBIT_SDK_URL}.gz --output ${TRELIS_SDK_PKG}
+
+
+
+
+      - name: Build HDF5
+        shell: bash -l {0}
+        run: |
+          build_hdf5
+
+      - name: Build MOAB
+        shell: bash -l {0}
+        run: |
+          build_moab
+
+      - name: build DAGMC
+        shell: bash -l {0}
+        run: |
+          build_dagmc
+
+      - name: Trelis setup
+        shell: bash -l {0}
+        env:   
+          CUBIT_DEB_URL: ${{ secrets[matrix.URL] }}
+          CUBIT_SDK_URL: ${{ secrets[matrix.URL_SDK] }}
+        run: |
+          setup_Trelis_sdk ${{ matrix.cubit }}
+
+      - name: build plugin
+        shell: bash -l {0}
+        run: |
+          build_plugin 
+
+      - name: prepare pkg
+        shell: bash -l {0}
+        run: |
+          build_plugin_pkg ${{ matrix.cubit }}
+
+      - name: 'Upload package'
+        uses: actions/upload-artifact@v2
+        with:
+          name: svalinn-plugin_linux_${{ matrix.cubit }}
+          path: /home/runner/work/Trelis-plugin/pack/svalinn-plugin_linux_cubit_${{ matrix.cubit }}.tgz
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 bld
+build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,15 +23,6 @@ endif ()
 # Use C++11
 set(CMAKE_CXX_STANDARD 11)
 
-# Adjust compiler setting for Linux using gcc version 5.0 and higher
-if (CMAKE_SYSTEM_NAME MATCHES Linux AND CMAKE_COMPILER_IS_GNUCXX)
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.0")
-    if (NOT CMAKE_CXX_FLAGS MATCHES _GLIBCXX_USE_CXX11_ABI)
-      set(CMAKE_CXX_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 ${CMAKE_CXX_FLAGS}")
-    endif ()
-  endif ()
-endif ()
-
 # Find Cubit/Trelis
 if (NOT CUBIT_ROOT)
   message(FATAL_ERROR "CUBIT_ROOT not specified")
@@ -80,6 +71,8 @@ if (BUILD_IGEOM)
   include_directories(iGeom)
   add_library(iGeom SHARED ${IGEOM_SRC_FILES})
   target_link_libraries(iGeom ${CUBIT_LIBS})
+   target_include_directories(iGeom PUBLIC
+                              $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
   install(TARGETS iGeom LIBRARY DESTINATION lib)
   list(APPEND PLUGIN_LINK_LIBS iGeom)
 endif ()
@@ -129,5 +122,6 @@ message(STATUS "Building Svalinn plugin")
 message(STATUS "PLUGIN_SRC_FILES: ${PLUGIN_SRC_FILES}")
 message(STATUS "PLUGIN_LINK_LIBS: ${PLUGIN_LINK_LIBS}")
 add_library(svalinn_plugin MODULE ${PLUGIN_SRC_FILES})
+target_include_directories(svalinn_plugin PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 target_link_libraries(svalinn_plugin ${PLUGIN_LINK_LIBS})
 install(TARGETS svalinn_plugin LIBRARY DESTINATION lib)
diff --git a/CubitVersionCompatibility.hpp b/CubitVersionCompatibility.hpp
@@ -0,0 +1,14 @@
+#ifndef SVALINN_COMPATIBILITY_HPP
+#define SVALINN_COMPATIBILITY_HPP
+
+#include "CubitVersion.h"
+
+#if CUBIT_VERSION_MAJOR <= 17
+    #define CUBIT_INTERFACE_HEADER "CubitInterface.hpp"
+    #define MSG_HANDLER CubitInterface::get_cubit_message_handler()
+#else
+    #define CUBIT_INTERFACE_HEADER "CubitCoreformInterface.hpp"
+    #define MSG_HANDLER CubitMessage::get_message_handler()
+#endif
+
+#endif  // SVALINN_COMPATIBILITY_HPP
diff --git a/SvalinnPlugin.cpp b/SvalinnPlugin.cpp
@@ -1,8 +1,11 @@
 #include "SvalinnPlugin.hpp"
+
 #include <sstream>
 
+#include "CubitVersionCompatibility.hpp"
+#include CUBIT_INTERFACE_HEADER
+
 #include "CubitMessageHandler.hpp"
-#include "CubitInterface.hpp"
 
 //Not including this when you aren't building the DAGMC export means you don't need to have MakeWatertight.hpp
 #ifdef BUILD_DAGMC_EXPORT
@@ -20,12 +23,12 @@
 SvalinnPlugin::SvalinnPlugin()
 {
 
-  CubitMessageHandler *console = CubitInterface::get_cubit_message_handler();
+  CubitMessageHandler* console = MSG_HANDLER;
   if (console) {
     std::ostringstream load_message;
     load_message.str("");
     load_message << "Loaded Svalinn plugin." << std::endl;
-    CubitInterface::get_cubit_message_handler()->print_error(load_message.str().c_str());
+    console->print_error(load_message.str().c_str());
   }
 
 }
diff --git a/export_dagmc_cmd/DAGMCExportCommand.cpp b/export_dagmc_cmd/DAGMCExportCommand.cpp
@@ -1,5 +1,7 @@
 #include "DAGMCExportCommand.hpp"
-#include "CubitInterface.hpp"
+
+#include "CubitVersionCompatibility.hpp"
+#include CUBIT_INTERFACE_HEADER
 
 // CGM includes
 #include "GeometryQueryTool.hpp"
@@ -27,7 +29,7 @@
 
 #define CHK_MB_ERR_RET(A,B)  if (moab::MB_SUCCESS != (B)) { \
   message << (A) << (B) << std::endl;                                   \
-  CubitInterface::get_cubit_message_handler()->print_message(message.str().c_str()); \
+  MSG_HANDLER ->print_message(message.str().c_str()); \
   return false;                                                         \
   }
 
@@ -46,12 +48,12 @@ DAGMCExportCommand::DAGMCExportCommand() :
   verbose_warnings = false;
   fatal_on_curves = false;
 
-  CubitMessageHandler *console = CubitInterface::get_cubit_message_handler();
+  CubitMessageHandler* console = MSG_HANDLER;
   if (console) {
     std::ostringstream load_message;
     load_message.str("");
     load_message << "-- DAGMC export command available." << std::endl;
-    CubitInterface::get_cubit_message_handler()->print_error(load_message.str().c_str());
+    console->print_error(load_message.str().c_str());
   }
 }
 
@@ -248,8 +250,8 @@ moab::ErrorCode DAGMCExportCommand::teardown()
     message << "----- All surfaces faceted correctly  -----" << std::endl;
   }
   message << "***** End of Faceting Summary Information *****" << std::endl;
- 
-  CubitInterface::get_cubit_message_handler()->print_message(message.str().c_str()); 
+
+  MSG_HANDLER->print_message(message.str().c_str());
   message.str("");
 
   
diff --git a/iGeom/iGeom.cpp b/iGeom/iGeom.cpp
@@ -1,7 +1,10 @@
 #include "iGeom.h"
+
+#include "CubitVersionCompatibility.hpp"
+#include CUBIT_INTERFACE_HEADER
+
 #include "CATag.hpp"
 #include "CubitEntity.hpp"
-#include "CubitInterface.hpp"
 #include "CubitVersion.h"
 #include "GeometryQueryTool.hpp"
 #include "Body.hpp"
@@ -150,7 +153,7 @@ void iGeom_createBrick(iGeom_Instance instance,
     error_message.str("");
     error_message << "Dimensions must be >= 0, or y & z must both be zero."
                   << std::endl;
-    CubitInterface::get_cubit_message_handler()->print_error(error_message.str().c_str());
+    MSG_HANDLER->print_error(error_message.str().c_str());
   }
   else {
 
@@ -606,7 +609,7 @@ void iGeom_intersectEnts(iGeom_Instance instance,
   }
 
   if (0 == new_body_list.size()) {
-    CubitInterface::get_cubit_message_handler()->print_error("Intersect Failed");
+    MSG_HANDLER->print_error("Intersect Failed");
     return;
   }
   else {
diff --git a/iGeom/tests/iGeom_test.cpp b/iGeom/tests/iGeom_test.cpp
@@ -1,7 +1,11 @@
 #include "iGeom_test.hpp"
-#include "iGeom.h"
+
 #include <vector>
-#include "CubitInterface.hpp"
+
+#include "CubitVersionCompatibility.hpp"
+#include CUBIT_INTERFACE_HEADER
+
+#include "iGeom.h"
 
 // CGM includes
 #include "GeometryModifyTool.hpp"
@@ -14,12 +18,12 @@ iGeom_test::iGeom_test()
   radius = 2.0;
   radius2 = 1.0;
 
-  CubitMessageHandler *console = CubitInterface::get_cubit_message_handler();
+  CubitMessageHandler* console = MSG_HANDLER;
   if (console) {
     std::ostringstream load_message;
     load_message.str("");
     load_message << "-- iGeom_test command available." << std::endl;
-    CubitInterface::get_cubit_message_handler()->print_error(load_message.str().c_str());
+    console->print_error(load_message.str().c_str());
   }
 }
 
diff --git a/import_mcnp_cmd/MCNPImp.cpp b/import_mcnp_cmd/MCNPImp.cpp
@@ -1,5 +1,8 @@
 #include "MCNPImp.hpp"
-#include "CubitInterface.hpp"
+
+#include "CubitVersionCompatibility.hpp"
+#include CUBIT_INTERFACE_HEADER
+
 #include "CubitMessage.hpp"
 #include "options.hpp"
 #include "mcnp2cad.hpp"
@@ -25,13 +28,12 @@ MCNPImp::MCNPImp()
   Gopt.override_tolerance = false;
   Gopt.input_file = "";
 
-
-  CubitMessageHandler *console = CubitInterface::get_cubit_message_handler();
+  CubitMessageHandler* console = MSG_HANDLER;
   if (console) {
     std::ostringstream load_message;
     load_message.str("");
     load_message << "-- MCNP import command available." << std::endl;
-    CubitInterface::get_cubit_message_handler()->print_error(load_message.str().c_str());
+    console->print_error(load_message.str().c_str());
   }
 
 }
diff --git a/scripts/README.md b/scripts/README.md
@@ -16,9 +16,15 @@ Linux (tested on Ubuntu 18.04 and 20.04):
     - `build_plugin_pkg()`: build a tarball containing the plugin
 
 - `build_plugin_linux.sh`: build the plugin on a linux computer (relies on apt-get to install required dependencies)
-    - arguments: Trelis/Cubit version to build the plugin for (only supported yet `17.1.0`)
+    - arguments: 
+        - 1 Trelis/Cubit version to build the plugin for (only supported yet `17.1.0`and Cubit `2020.2`)
+        - 2 path to Trelis/Cubit package folder (containing Trelis install package and SDK)
+        - 3 name of the Trelis deb package
+        - 4 name of the Trelis sdk tarball
 - `build_plugin_docker_ubuntu.sh`: build the plugin in a docker container 
     - arguments: Arguments have to be provided in order
         - 1 docker image (tested on `ubuntu:18.04` and `ubuntu:20.04`)
-        - 2 local path to the folder containing the Trelis/Cubit install deb and SDK
-        - 3 version of Cubit Trelis to build the plugin for (only tested with `17.1.0`)
+        - 2 version of Cubit Trelis to build the plugin for (only tested with `17.1.0` and Cubit `2020.2`)
+        - 3 local path to the folder containing the Trelis/Cubit install deb and SDK
+        - 4 name of the Trelis deb package
+        - 5 name of the Trelis sdk tarball
diff --git a/scripts/build_plugin_docker_ubuntu.sh b/scripts/build_plugin_docker_ubuntu.sh
@@ -1,4 +1,12 @@
 #!/bin/bash
 
+
+# Usage: 
+# $1: docker image to use (tested with ubuntu:18.04 and ubuntu:20.04)
+# $2: Trelis/Cubit version to install, 17.1.0 or 2020.2
+# $3 path to local pkg folder containing both trelis/cubit install package and sdk
+# $4 name of the Trelis deb package
+# $5 name of the Trelis sdk tarball
+
 SCRIPTPATH=`dirname $(dirname $(realpath $0))`
-docker run -v "$SCRIPTPATH:/Trelis-plugin" -v "$2:/Trelis-sdk" -it $1 bash -c "/Trelis-plugin/script/build_plugin.sh $3; bash"
+docker run -v "$SCRIPTPATH:/Trelis-plugin" -v "$3:/trelis-sdk" -it $1 bash -c "/Trelis-plugin/scripts/build_plugin_linux.sh $2 /trelis-sdk $4 $5; bash"
diff --git a/scripts/build_plugin_linux.sh b/scripts/build_plugin_linux.sh
diff --git a/scripts/linux_share_build.sh b/scripts/linux_share_build.sh
