Skip to content

Depend on the source headers directly #1587

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

Merged
merged 12 commits into from
Mar 18, 2024

Conversation

ZzEeKkAa
Copy link
Contributor

@ZzEeKkAa ZzEeKkAa commented Mar 8, 2024

Update CMake configuration and headers to use better target dependencies. It will unblock incremental compilation and flexible dependency management.

  • Have you provided a meaningful PR description?
  • Have you added a test, reproducer or referred to an issue with a reproducer?
  • Have you tested your changes locally for CPU and GPU devices?
  • Have you made sure that new changes do not introduce compiler warnings?
  • Have you checked performance impact of proposed changes?
  • If this PR is a work in progress, are you opening the PR as a draft?

@ZzEeKkAa ZzEeKkAa force-pushed the feature/include_from_source branch 2 times, most recently from 5d493d4 to efc9d89 Compare March 11, 2024 23:17
@ZzEeKkAa ZzEeKkAa marked this pull request as ready for review March 11, 2024 23:17
@ZzEeKkAa ZzEeKkAa self-assigned this Mar 11, 2024
@ZzEeKkAa ZzEeKkAa force-pushed the feature/include_from_source branch 4 times, most recently from 8fe19a1 to be87cbf Compare March 11, 2024 23:30
Copy link

github-actions bot commented Mar 12, 2024

Deleted rendered PR docs from intelpython.github.com/dpctl, latest should be updated shortly. 🤞

Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_108 ran successfully.
Passed: 906
Failed: 0
Skipped: 94

1 similar comment
Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_108 ran successfully.
Passed: 906
Failed: 0
Skipped: 94

@ZzEeKkAa ZzEeKkAa force-pushed the feature/include_from_source branch from be87cbf to 474d6b0 Compare March 12, 2024 00:25
Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_108 ran successfully.
Passed: 906
Failed: 0
Skipped: 94

@ZzEeKkAa ZzEeKkAa force-pushed the feature/include_from_source branch from 474d6b0 to 0cdb12d Compare March 12, 2024 03:14
Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_108 ran successfully.
Passed: 906
Failed: 0
Skipped: 94

Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_109 ran successfully.
Passed: 906
Failed: 0
Skipped: 94

@ZzEeKkAa ZzEeKkAa force-pushed the feature/include_from_source branch from ee34da3 to bbf6c31 Compare March 14, 2024 18:21
Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_113 ran successfully.
Passed: 905
Failed: 1
Skipped: 94

Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_114 ran successfully.
Passed: 905
Failed: 1
Skipped: 94

Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_115 ran successfully.
Passed: 905
Failed: 1
Skipped: 94

@ZzEeKkAa ZzEeKkAa force-pushed the feature/include_from_source branch from dabcc36 to d08e2f1 Compare March 14, 2024 21:43
@ZzEeKkAa ZzEeKkAa force-pushed the feature/include_from_source branch from d08e2f1 to 6f83a43 Compare March 14, 2024 21:52
@coveralls
Copy link
Collaborator

coveralls commented Mar 14, 2024

Coverage Status

coverage: 87.832%. remained the same
when pulling 1757afe on feature/include_from_source
into 80f4f30 on master.

Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_123 ran successfully.
Passed: 905
Failed: 1
Skipped: 94

@ZzEeKkAa ZzEeKkAa changed the title WIP: depend on the source headers Depend on the source headers Mar 14, 2024
@ZzEeKkAa ZzEeKkAa changed the title Depend on the source headers Depend on the source headers directly] Mar 14, 2024
@ZzEeKkAa ZzEeKkAa changed the title Depend on the source headers directly] Depend on the source headers directly Mar 14, 2024
@oleksandr-pavlyk
Copy link
Contributor

oleksandr-pavlyk commented Mar 15, 2024

Increase in coverage is due to disappearence of Cython files from coverage.

This issue must resolved before the PR can be merged.

We need to understand whether the regression is due to changes of build script or due to upgrade from Cython 3.0.8 to Cuthon 3.0.9 that happened since the PR was first opened.

@oleksandr-pavlyk
Copy link
Contributor

gh-1586 does not exhibit changes in coverage metrics despite also using Cython 3.0.9.

I also checked that C++ code generated by Cython did not materially change between versions.

Thus the change is caused by build system reorg.

@oleksandr-pavlyk
Copy link
Contributor

This message emitted while processing .coverage database points to a problem:

Source file is not python /home/runner/work/dpctl/dpctl/dpctl/_diagnostics.pyx

@ZzEeKkAa
Copy link
Contributor Author

May it be because we don't copy headers/cpp files of cython to source directory and they are always in build directory now?

@oleksandr-pavlyk
Copy link
Contributor

May it be because we don't copy headers/cpp files of cython to source directory and they are always in build directory now?

Yes, indeed. See http://blog.behnel.de/posts/coverage-analysis-for-cython-modules.html

I have pushed changes to copy CXX files into layout for coverage builds.

Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_127 ran successfully.
Passed: 906
Failed: 0
Skipped: 94

Copy link

Array API standard conformance tests for dpctl=0.17.0dev0=py310h15de555_128 ran successfully.
Passed: 906
Failed: 0
Skipped: 94

Copy link
Contributor

@oleksandr-pavlyk oleksandr-pavlyk left a comment

Choose a reason for hiding this comment

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

Thank you for getting this done @ZzEeKkAa ! Looks good to me now!

@oleksandr-pavlyk
Copy link
Contributor

Testing clean building with and without use of lld, using

/usr/bin/time -f "%P %M %E" python scripts/build_locally.py --verbose

outputs are, on my WSL machine,

with lld
641% 3953024 20:24.33

with default linker
632% 4048804 20:59.47

Copy link
Collaborator

@ndgrigorian ndgrigorian left a comment

Choose a reason for hiding this comment

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

I have also tested building this branch locally and it worked fine, so LGTM

@oleksandr-pavlyk
Copy link
Contributor

I have checked locally that dpnp build continues working as expected.

@antonwolfy
Copy link
Collaborator

I can also confirm that dpnp build works with that PR without any issue.

@oleksandr-pavlyk oleksandr-pavlyk merged commit 1fac073 into master Mar 18, 2024
@oleksandr-pavlyk oleksandr-pavlyk deleted the feature/include_from_source branch March 18, 2024 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants