Skip to content
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.

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

Adds hpx_wrap to HPX_LINK_LIBRARIES which links only when specified. #3374

Merged
merged 2 commits into from Jul 11, 2018

Conversation

Projects
None yet
2 participants
@NK-Nikunj
Copy link
Contributor

NK-Nikunj commented Jul 10, 2018

Fixes Failing tests in Phylanx

Proposed Changes

  • Excludes libhpx_wrap.a from HPX_LIBRARIES list. It is now linked only when specified.
  • Exports HPX_LINKER_FLAGS instead of changing CMAKE_EXE_LINKER_FLAGS. It should be added for executables along with the link library (that is exported by the name of HPX_LINK_LIBRARIES).
@hkaiser

This comment has been minimized.

Copy link
Member

hkaiser commented Jul 10, 2018

@NK-Nikunj please rebase your branch onto master, otherwise we can't go ahead with this.

@NK-Nikunj

This comment has been minimized.

Copy link
Contributor Author

NK-Nikunj commented Jul 10, 2018

@hkaiser on it.

@NK-Nikunj NK-Nikunj force-pushed the NK-Nikunj:add_to_hpx_library branch from ad775cb to 8b80ad9 Jul 10, 2018

@NK-Nikunj NK-Nikunj force-pushed the NK-Nikunj:add_to_hpx_library branch from 8b80ad9 to bd51328 Jul 10, 2018

if(HPX_WITH_DYNAMIC_HPX_MAIN AND ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux"))
set(export_hpx_wrap "hpx_wrap")
endif()

This comment has been minimized.

@hkaiser

hkaiser Jul 10, 2018

Member

Couldn't this be simply added to the hpx_targets list?

This comment has been minimized.

@NK-Nikunj

NK-Nikunj Jul 10, 2018

Author Contributor

hpx_targets is later exported with dependencies. So hpx_wrap will be added as a target dependency (please correct me if I'm wrong).

This comment has been minimized.

@hkaiser

hkaiser Jul 10, 2018

Member

Fair point.

This comment has been minimized.

@NK-Nikunj

NK-Nikunj Jul 11, 2018

Author Contributor

@hkaiser I have tested it including in hpx_targets. Turns out hpx_wrap was added to Phylanx .so files because hpx_wrap was added in HPX_CONF_LIBRARIES in GeneratePackage.
hpx_targets has nothing to do with final HPX_LIBRARIES exported (and it's potential linkage with HPX applications). So, I've added hpx_wrap back to hpx_targets.
I've tested this configuration with Debug/Release and HPX_WITH_DYNAMIC_MAIN ON/OFF.

@NK-Nikunj NK-Nikunj force-pushed the NK-Nikunj:add_to_hpx_library branch from e397a32 to f6532d5 Jul 11, 2018

@hkaiser hkaiser merged commit e46cd4b into STEllAR-GROUP:master Jul 11, 2018

47 checks passed

ci/circleci: checkout_code Your tests passed on CircleCI!
Details
ci/circleci: clang_tidy Your tests passed on CircleCI!
Details
ci/circleci: configure Your tests passed on CircleCI!
Details
ci/circleci: core Your tests passed on CircleCI!
Details
ci/circleci: examples Your tests passed on CircleCI!
Details
ci/circleci: inspect Your tests passed on CircleCI!
Details
ci/circleci: install Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.compat Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.components Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.compute Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.config Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.include Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.lcos Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.parallel Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.performance_counters Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.plugins Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.runtime Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.traits Your tests passed on CircleCI!
Details
ci/circleci: tests.headers.util Your tests passed on CircleCI!
Details
ci/circleci: tests.performance Your tests passed on CircleCI!
Details
ci/circleci: tests.regressions Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.actions Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.agas Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.build Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.component Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.computeapi Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.diagnostics Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.lcos Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.parallel.algorithms Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.parallel.block Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.parallel.container_algorithms Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.parallel.datapar_algorithms Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.parallel.executors Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.parallel.segmented_algorithms Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.parcelset Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.performance_counter Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.resource Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.serialization Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.threads Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.traits Your tests passed on CircleCI!
Details
ci/circleci: tests.unit.util Your tests passed on CircleCI!
Details
pycicle daint-3374-clang-6.0.0-Boost-1.65.0-Release Build errors 0
Details
pycicle daint-3374-clang-6.0.0-Boost-1.65.0-Release Config errors 0
Details
pycicle daint-3374-clang-6.0.0-Boost-1.65.0-Release Test errors 0
Details
pycicle daint-gcc-7.3.0-boost-1.67.0-c++17-Release Build errors 0
Details
pycicle daint-gcc-7.3.0-boost-1.67.0-c++17-Release Config errors 0
Details
pycicle daint-gcc-7.3.0-boost-1.67.0-c++17-Release Test errors 0
Details

@hkaiser hkaiser added this to the 1.2.0 milestone Jul 18, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.