Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in
haskell-gargantext
haskell-gargantext
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 159
    • Issues 159
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 8
    • Merge Requests 8
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • gargantext
  • haskell-gargantexthaskell-gargantext
  • Merge Requests
  • !133

Merged
Opened Feb 16, 2023 by Alfredo Di Napoli@AlfredoDiNapoli
  • Report abuse
Report abuse

Switch to Hackage-released version of HSvm, hstatistics

This commit switches to an Hackage-released version of HSvm, specifically 0.1.1.3.22, which is the same we were previously relying on, but by pinning on a specific commit 3fe28b683aba5ddf05e3b5f8eced0bd05c5a29f9 of the GitHub repo.

I have done the due diligence to make sure the version we were previously using was the same of the released one, to avoid nasty regressions. In particular, I have compared the SHAs of all the files in the project, both for the Hackage version and the Github version (after checking out the correct commit SHA) and here are the results:

(ghc-8.10.7 cbl-3.4.0.0 stk-2.7.5) lib-diff/HSvm (remotes/origin/feature/svm-3.25~1^2) > find . -type f | grep -v ".git" | xargs -I{} sha256sum {}
94d28343009418050aca63e388362f08caf5089b4ae90577595368a493c87943  ./cbits/svm.h
772a2611bb0aefaaca9a5cd586f17cc85f3e7889c3f743535c4acdd8852ae3f3  ./cbits/svm.cpp
62cc0d0ced6fcc08ee076cfdaf20e543af2118d54cfc71f441a1e4432ad984b1  ./stack.yaml
5066653559d4d6134b022d66a634a17fdcf8db35d28b447e581fec284afa4689  ./Setup.hs
8e1e203a43ccd0e4cc9b6013b4a42609297b800f1e9aacaca23ecaa6623b2eff  ./LICENSE
8738582837b556d55b7247fd460176e3c8595ae6335b8889b7b8cd5764834928  ./HSvm.cabal
2929bfec8596554ebcedbd3a9e95f178b332fab5be723a8f4d13dfd4dae6c7d9  ./Data/SVM.hs
04238d7a50051ba890f824b5d677651841fba4e7d89c86e1b4de3d538b626bb8  ./Data/SVM/Raw.hsc
9953749c51397a5f44fb4be96b6b1bb82ce2461bb0e94642134b3c771755217a  ./docs.sh

vs

(ghc-8.10.7 cbl-3.4.0.0 stk-2.7.5) lib-diff/HSvm-0.1.1.3.22 > find . -type f | xargs -I{} sha256sum {}                    
94d28343009418050aca63e388362f08caf5089b4ae90577595368a493c87943  ./cbits/svm.h
772a2611bb0aefaaca9a5cd586f17cc85f3e7889c3f743535c4acdd8852ae3f3  ./cbits/svm.cpp
5066653559d4d6134b022d66a634a17fdcf8db35d28b447e581fec284afa4689  ./Setup.hs
8e1e203a43ccd0e4cc9b6013b4a42609297b800f1e9aacaca23ecaa6623b2eff  ./LICENSE
8738582837b556d55b7247fd460176e3c8595ae6335b8889b7b8cd5764834928  ./HSvm.cabal
2929bfec8596554ebcedbd3a9e95f178b332fab5be723a8f4d13dfd4dae6c7d9  ./Data/SVM.hs
04238d7a50051ba890f824b5d677651841fba4e7d89c86e1b4de3d538b626bb8  ./Data/SVM/Raw.hsc

The TL;DR is that the Hackage version includes the same code as the version we were previously using.

Another stepping stone for #180.

Edited Feb 20, 2023 by Alfredo Di Napoli

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b adinapoli/switch-hsvm origin/adinapoli/switch-hsvm

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/dev
git merge --no-ff adinapoli/switch-hsvm

Step 4. Push the result of the merge to GitLab

git push origin dev

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 2
  • Commits 2
  • Pipelines 3
  • Changes 1
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: gargantext/haskell-gargantext!133

Revert this commit

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this commit

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.