Changes for compilation using AppleClang on MacOS #28
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
igorauad
added a commit
that referenced
this pull request
Jul 7, 2023
Construct gr::complex with {float re, float im} instead of relying on
complex literals, given that the latter may not work with Clang, as
reported in #28.
igorauad
added a commit
that referenced
this pull request
Jul 7, 2023
Construct gr::complex with {float re, float im} instead of relying on
complex literals, given that the latter may not work with Clang, as
reported in #28.
To reproduce the changes in this patch, use the following script:
cmd='sed -i '' \
-e "s/(SQRT2_2 + SQRT2_2i)/{SQRT2_2, SQRT2_2}/g" \
-e "s/(-SQRT2_2 - SQRT2_2i)/{-SQRT2_2, -SQRT2_2}/g" \
-e "s/(-SQRT2_2 + SQRT2_2i)/{-SQRT2_2, SQRT2_2}/g" \
-e "s/(SQRT2_2 - SQRT2_2i)/{SQRT2_2, -SQRT2_2}/g" \
-e "s/(+SQRT2_2 + SQRT2_2i)/{SQRT2_2, SQRT2_2}/g" \
-e "s/(-SQRT2_2 + SQRT2_2i)/{-SQRT2_2, SQRT2_2}/g" \
-e "s/(+SQRT2_2 - SQRT2_2i)/{SQRT2_2, -SQRT2_2}/g" \
-e "s/(-SQRT2_2 - SQRT2_2i)/{-SQRT2_2, -SQRT2_2}/g" \
$1 && clang-format -i $1'
find . -name *.h -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.cc -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.hh -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.cc -path "./bench/*" -exec bash -c "$cmd" -- {} \;
igorauad
added a commit
that referenced
this pull request
Jul 7, 2023
Construct gr::complex with {float re, float im} instead of relying on
complex literals, given that the latter may not work with Clang, as
reported in #28.
To reproduce the changes in this patch, use the following script:
cmd='sed -i '' \
-e "s/(SQRT2_2 + SQRT2_2i)/{SQRT2_2, SQRT2_2}/g" \
-e "s/(-SQRT2_2 - SQRT2_2i)/{-SQRT2_2, -SQRT2_2}/g" \
-e "s/(-SQRT2_2 + SQRT2_2i)/{-SQRT2_2, SQRT2_2}/g" \
-e "s/(SQRT2_2 - SQRT2_2i)/{SQRT2_2, -SQRT2_2}/g" \
-e "s/(+SQRT2_2 + SQRT2_2i)/{SQRT2_2, SQRT2_2}/g" \
-e "s/(-SQRT2_2 + SQRT2_2i)/{-SQRT2_2, SQRT2_2}/g" \
-e "s/(+SQRT2_2 - SQRT2_2i)/{SQRT2_2, -SQRT2_2}/g" \
-e "s/(-SQRT2_2 - SQRT2_2i)/{-SQRT2_2, -SQRT2_2}/g" \
-e "s/(-1.0j)/{ 0, -1.0 }/g" \
-e "s/(+1.0j)/{ 0, 1.0 }/g" \
-e "s/1j/{ 0, 1.0 }/g" \
$1 && clang-format -i $1'
find . -name *.h -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.cc -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.hh -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.cc -path "./bench/*" -exec bash -c "$cmd" -- {} \;
|
Hi @wbenoot , Thanks for the PR. These changes are a little tedious to review manually, so I thought I should make a script to reproduce them. I've pushed the changes in c079787, which were generated by the following script: #!/bin/bash
cmd='sed -i '' \
-e "s/(SQRT2_2 + SQRT2_2i)/{SQRT2_2, SQRT2_2}/g" \
-e "s/(-SQRT2_2 - SQRT2_2i)/{-SQRT2_2, -SQRT2_2}/g" \
-e "s/(-SQRT2_2 + SQRT2_2i)/{-SQRT2_2, SQRT2_2}/g" \
-e "s/(SQRT2_2 - SQRT2_2i)/{SQRT2_2, -SQRT2_2}/g" \
-e "s/(+SQRT2_2 + SQRT2_2i)/{SQRT2_2, SQRT2_2}/g" \
-e "s/(-SQRT2_2 + SQRT2_2i)/{-SQRT2_2, SQRT2_2}/g" \
-e "s/(+SQRT2_2 - SQRT2_2i)/{SQRT2_2, -SQRT2_2}/g" \
-e "s/(-SQRT2_2 - SQRT2_2i)/{-SQRT2_2, -SQRT2_2}/g" \
-e "s/(-1.0j)/{ 0, -1.0 }/g" \
-e "s/(+1.0j)/{ 0, 1.0 }/g" \
-e "s/1j/{ 0, 1.0 }/g" \
$1 && clang-format -i $1'
find . -name *.h -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.cc -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.hh -path "./lib/*" -exec bash -c "$cmd" -- {} \;
find . -name *.cc -path "./bench/*" -exec bash -c "$cmd" -- {} \;Could you please rebase your PR so that I can check if there was any change left? I also see the change about finding boost. I wonder if we should use |
|
Also, I've been meaning to test the compilation using Clang on CI for some time. The changes are in 2c3fdec. However, I never figured out a solution for the issue reported in #4 (comment). Have you tried running |
|
hi @igorauad I rebased, there was only one file not updated by your script. |
|
Thanks! |
igorauad
added a commit
that referenced
this pull request
Jul 11, 2023
As indicated in #28, the macOS build requires an explicit find_package call to find the Boost::unit_test_framework component to which each unit test application is linked (via the GR_ADD_CPP_TEST call).
igorauad
added a commit
that referenced
this pull request
Oct 24, 2023
As indicated in #28, the macOS build requires an explicit find_package call to find the Boost::unit_test_framework component to which each unit test application is linked (via the GR_ADD_CPP_TEST call).
igorauad
added a commit
that referenced
this pull request
Oct 24, 2023
As indicated in #28, the macOS build requires an explicit find_package call to find the Boost::unit_test_framework component to which each unit test application is linked (via the GR_ADD_CPP_TEST call).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Eventhough Boost was found, it had some issues with finding unit_test_framework.
Implicit casting caused troubles only when using Clang compiler, GCC worked fine.