Skip to content

Llir improvement #292

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 96 commits into from
Apr 22, 2025
Merged

Llir improvement #292

merged 96 commits into from
Apr 22, 2025

Conversation

waterlens
Copy link
Member

@waterlens waterlens commented Mar 17, 2025

  • Clean on-going optimizer code out
  • Figure out why the merge break the class lifter tests

waterlens and others added 30 commits January 14, 2025 14:19
# Conflicts:
#	.github/workflows/nix.yml
#	hkmc2/shared/src/main/scala/hkmc2/codegen/Printer.scala
#	hkmc2DiffTests/src/test/scala/hkmc2/DiffTestRunner.scala
# Conflicts:
#	hkmc2/shared/src/main/scala/hkmc2/codegen/llir/Builder.scala
@waterlens
Copy link
Member Author

I think this PR is now ready to be merged. @LPTK

output(cpp.toDocument.toString)
val rPath = os.Path(rootPath)
val auxPath =
if rPath.last == "mlscript" then
Copy link
Contributor

Choose a reason for hiding this comment

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

This logic is incorrect: you cannot assume that the folder containing this github clone is named "mlscript".

Copy link
Member Author

Choose a reason for hiding this comment

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

Now, I'll switch to check the relative path. This won't cause issues unless we move the subproject out of the hkmc2/shared directory. If that happens, many things will likely break too, and we can apply a new fix in a batch together. How do you think about this?

Copy link
Contributor

Choose a reason for hiding this comment

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

It was still wrong (what if the MLscript project is cloned in a folder named shared?), but I've fixed it now.

@LPTK
Copy link
Contributor

LPTK commented Apr 16, 2025

Also, we should probably comment out the :rcpp lines in this PR. Later, we'll move these tests to a different SBT sub-project, so they don't slow down the diff-tests.

Copy link
Contributor

@LPTK LPTK left a comment

Choose a reason for hiding this comment

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

LGTM now!

@LPTK LPTK merged commit 0f73455 into hkust-taco:hkmc2 Apr 22, 2025
1 check passed
@LPTK
Copy link
Contributor

LPTK commented Apr 22, 2025

Don't forget to delete the branch (it looks like I can't do it myself for some reason).

@waterlens waterlens deleted the feat-llir branch April 22, 2025 09:30
@waterlens
Copy link
Member Author

Don't forget to delete the branch (it looks like I can't do it myself for some reason).

Sure.
It's in my own fork, so you can't do anything with it :)

@LPTK
Copy link
Contributor

LPTK commented Apr 22, 2025

Usually, I have the option of deleting merged branches even when they're from other forks. There's probably an option somewhere.

FlandiaYingman pushed a commit to FlandiaYingman/mlscript that referenced this pull request Apr 23, 2025
Co-authored-by: Lionel Parreaux <lionel.parreaux@gmail.com>
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.

2 participants