Skip to content

Fixes for PR717 #1

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.

Sign up for GitHub

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

Draft
hughcars wants to merge 1 commit into
base: cudss
Choose a base branch
from
Draft

Fixes for PR717 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/license-check/c.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
6 changes: 3 additions & 3 deletions cmake/ExternalGitTags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ set(EXTERN_METIS_GIT_TAG

# MFEM
set(EXTERN_MFEM_URL
"https://github.com/yuyangdai/mfem.git" CACHE STRING
"https://github.com/mfem/mfem.git" CACHE STRING
"URL for external MFEM build"
)
set(EXTERN_MFEM_GIT_BRANCH
"cudss-dev" CACHE STRING
"master" CACHE STRING
"Git branch for external MFEM build"
)
set(EXTERN_MFEM_GIT_TAG
"e217864f168acb1d7bdb3fd7c5aa73ef81951237" CACHE STRING
"d9d6526cc1749980a2ba1da16e2c1ca1e07d82ec" CACHE STRING
"Git tag for external MFEM build"
)

Expand Down
4 changes: 3 additions & 1 deletion cmake/ExternalMFEM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ if(PALACE_WITH_CUDA)
"-DCMAKE_CUDA_FLAGS=${MFEM_CUDA_FLAGS}"
"-DMFEM_USE_CUDSS=${PALACE_WITH_CUDSS}"
)
if(PALACE_WITH_CUDSS)
if(PALACE_WITH_CUDSS AND NOT "${CUDSS_DIR}" STREQUAL "")
list(APPEND MFEM_OPTIONS
"-DCUDSS_DIR=${CUDSS_DIR}"
)
Expand Down Expand Up @@ -406,6 +406,8 @@ set(MFEM_PATCH_FILES
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_par_tet_mesh_fix_dev.diff"
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/patch_gmsh_parser_performance.diff"
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/mfem_pr5280.diff"
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/mfem_pr5246.diff"
"${CMAKE_SOURCE_DIR}/extern/patch/mfem/mfem_pr5124_cudss.diff"
)

include(ExternalProject)
Expand Down
Loading