Skip to content

Commit

Permalink
Merge pull request #610 from rafmudaf/infrastructure_updates
Browse files Browse the repository at this point in the history
Infrastructure Improvements
  • Loading branch information
rafmudaf authored Dec 11, 2020
2 parents d65e1da + 891a5ac commit 4b5559f
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 99 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/automated-dev-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,17 @@ name: 'Development Pipeline'

on:
push:
paths-ignore:
- 'docs/**'
- 'share/**'
- 'vs-build/**'

pull_request:
types: [opened, synchronize] #labeled, assigned]
paths-ignore:
- 'docs/**'
- 'share/**'
- 'vs-build/**'

# runs-on: ${{ matrix.os }}
# strategy:
Expand All @@ -15,10 +23,6 @@ on:
jobs:
build-and-test:

# Do not run if:
# - Branch name contains "docs/"
if: "!contains(github.ref, 'docs/')"

runs-on: ubuntu-latest
container:
image: rafmudaf/openfast-ubuntu:dev
Expand Down Expand Up @@ -87,10 +91,6 @@ jobs:
# Test if single precision compile completes.
# Do not run the test suite.

# Do not run if:
# - Branch name contains "docs/"
if: "!contains(github.ref, 'docs/')"

runs-on: ubuntu-latest
container:
image: rafmudaf/openfast-ubuntu:dev
Expand All @@ -113,3 +113,6 @@ jobs:
uses: ./.github/actions/compile
with:
build-target: 'all'
- name: simple-test
working-directory: /openfast/build
run: ./glue-codes/openfast/openfast -v
70 changes: 0 additions & 70 deletions .travis.yml

This file was deleted.

19 changes: 0 additions & 19 deletions CTestConfig.cmake

This file was deleted.

11 changes: 9 additions & 2 deletions glue-codes/openfast/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@
# limitations under the License.
#

add_executable(openfast
src/FAST_Prog.f90)
add_executable(openfast src/FAST_Prog.f90)
target_link_libraries(openfast openfast_postlib foamfastlib)
set_property(TARGET openfast PROPERTY LINKER_LANGUAGE Fortran)

if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU" AND ${CMAKE_Fortran_COMPILER_ID} STREQUAL "RELEASE")
# With variable tracking enabled, the compile step frequently aborts on large modules and
# restarts with this option off. Disabling in Release mode avoids this problem when compiling with
# full optimizations, but leaves it enabled for RelWithDebInfo which adds both -O2 and -g flags.
# https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html
set_source_files_properties(src/FAST_Prog.f90 PROPERTIES COMPILE_FLAGS "-fno-var-tracking -fno-var-tracking-assignments")
endif()

install(TARGETS openfast
RUNTIME DESTINATION bin)
13 changes: 13 additions & 0 deletions modules/openfast-library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ if (GENERATE_TYPES)
endif()

add_library(openfast_prelib src/FAST_Types.f90)

target_link_libraries(openfast_prelib
nwtclibs
ifwlib
Expand Down Expand Up @@ -55,6 +56,18 @@ target_link_libraries(openfast_postlib openfast_prelib scfastlib foamfastlib ver
add_library(openfastlib src/FAST_Library.f90)
target_link_libraries(openfastlib openfast_postlib openfast_prelib scfastlib foamfastlib)

if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU" AND ${CMAKE_Fortran_COMPILER_ID} STREQUAL "RELEASE")
# With variable tracking enabled, the compile step frequently aborts on large modules and
# restarts with this option off. Disabling in Release mode avoids this problem when compiling with
# full optimizations, but leaves it enabled for RelWithDebInfo which adds both -O2 and -g flags.
# https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html
set_source_files_properties(
src/FAST_Subs.f90 src/FAST_Types.f90 src/FAST_Library.f90
PROPERTIES
COMPILE_FLAGS "-fno-var-tracking -fno-var-tracking-assignments"
)
endif()

install(TARGETS openfastlib openfast_prelib openfast_postlib
EXPORT ${CMAKE_PROJECT_NAME}Libraries
RUNTIME DESTINATION lib
Expand Down

0 comments on commit 4b5559f

Please sign in to comment.