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

[FLORA-794] Replace the usage of datalog with Haskell for category normalisation #822

Open
wants to merge 3 commits into
base: development
Choose a base branch
from

Conversation

mau5mat
Copy link
Contributor

@mau5mat mau5mat commented Jan 18, 2025

Proposed changes

Contributor checklist

Copy link
Contributor

@tchoutri tchoutri left a comment

Choose a reason for hiding this comment

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

First pass :)

@@ -83,11 +76,6 @@ COPY --chown=${USER} scripts/.zshrc /home/$USER/.zshrc
COPY --chown=${USER} cabal.project flora.cabal cabal.project.freeze ./
RUN cabal build --only-dependencies -j

# compile Souffle source files
COPY --chown=${USER} Makefile ./
Copy link
Contributor

Choose a reason for hiding this comment

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

We still need the Makefile. :)

@@ -145,9 +145,6 @@ docker-enter: ## Enter the docker environment
start-tmux: ## Start a Tmux session with hot code reloading
./scripts/start-tmux.sh

soufflé: ## Generate C++ files from the Soufflé Datalog definitions
Copy link
Contributor

Choose a reason for hiding this comment

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

You must remove all the other references to this Makefile rule in other rules.

@@ -395,7 +395,6 @@ constraints: any.Cabal ==3.10.3.0,
any.some ==1.0.6,
some +newtype-unsafe,
any.sop-core ==0.5.0.2,
any.souffle-haskell ==4.0.0,
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you re-generate the file as a whole? This will also remove unneeded transitive dependencies.

Copy link
Contributor

Choose a reason for hiding this comment

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

We should keep this file, it's just that we're going to use the new functions now!

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