Skip to content

Commit

Permalink
Merge pull request #224 from minrk/fix-impi-paths
Browse files Browse the repository at this point in the history 
impi: avoid cmake syntax errors caused by backslashes
  • Loading branch information
@minrk
minrk authored Jun 4, 2024
2 parents 2c92144 + 3254858 commit 8f00abe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions recipe/bld.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ set HDF5_EXT_ZLIB=zlib.lib

set "CXXFLAGS=%CXXFLAGS% -LTCG"
if "%mpi%"=="impi" (
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_C_ADDITIONAL_INCLUDE_DIRS=%LIBRARY_PREFIX%\include"
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_CXX_ADDITIONAL_INCLUDE_DIRS=%LIBRARY_PREFIX%\include"
:: cmake generates syntax errors if there are backslashes in paths
set _LIBRARY=%LIBRARY_PREFIX:\=/%
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_C_ADDITIONAL_INCLUDE_DIRS:PATH=!_LIBRARY!/include"
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_CXX_ADDITIONAL_INCLUDE_DIRS:PATH=!_LIBRARY!/include"

This comment has been minimized.

Sign in to view

Copy link
@hmaarrfk

hmaarrfk Jun 4, 2024

Contributor

I've seen the :PATH be more important than anything else on windows.

Thanks for continue to work through this!
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_C_LIB_NAMES=IMPI"
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_CXX_LIB_NAMES=IMPI"
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_IMPI_LIBRARY=impi.lib"
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_IMPI_LIBRARY:PATH=!_LIBRARY!/lib/impi.lib"
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_ASSUME_NO_BUILTIN_MPI=ON"
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_SKIP_COMPILER_WRAPPER=ON"
set "CMAKE_ARGS=!CMAKE_ARGS! -D MPI_SKIP_GUESSING=ON"
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set version = "1.14.3" %}
{% set maj_min_ver = ".".join(version.split(".")[:2]) %}
{% set build = 3 %}
{% set build = 4 %}

# recipe-lint fails if mpi is undefined
{% set mpi = mpi or 'nompi' %}
Expand Down

1 comment on commit 8f00abe

@conda-forge-webservices
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! This is the friendly automated conda-forge-webservice.

I updated the Github team because of this commit.

You should get push access to this feedstock and CI services.

Your package won't be available for installation locally until it is built
and synced to the anaconda.org CDN (takes 1-2 hours after the build finishes).

Feel free to join the community Element channel.

NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details on this are here.

Please sign in to comment.