Merge branch 'master' of https://github.com/Juice-jl/ProbabilisticCircuits.jl

Author: liuanji

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   DATADEPS_ALWAYS_ACCEPT: 1
-  JIVE_PROCS: 2
+  JIVE_PROCS: 1
 
 jobs:
   build:

.travis.yml

@@ -5,52 +5,21 @@ os:
 
 dist: bionic
 
-
 julia: 
   - 1.5
 
 env:
-  DATADEPS_ALWAYS_ACCEPT=1 JIVE_PROCS=2  
+  DATADEPS_ALWAYS_ACCEPT=1 JIVE_PROCS=1  
 
 jobs:
   include:   
-  
     - stage: "Unit Tests"    
       script:
         - julia --project -e 'using Pkg; Pkg.develop(PackageSpec(name="LogicCircuits")); Pkg.instantiate(); Pkg.build();'
-        # - julia --project=test/ -e 'using Pkg; Pkg.instantiate(); Pkg.build();'
-        - julia --project --check-bounds=yes --depwarn=error -e 'import Pkg; Pkg.test(; coverage=true)'
+        - julia --project --check-bounds=yes --depwarn=yes -e 'import Pkg; Pkg.test(; coverage=true)'
       after_success:
         - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder());'
 
-#     - stage: "Documentation"
-#       addons:
-#         apt:
-#           packages:
-#             - poppler-utils
-#             - pdf2svg
-#             - texlive-latex-base
-#             - texlive-binaries
-#             - texlive-pictures
-#             - texlive-latex-extra
-#             - texlive-luatex
-#             - texlive-xetex
-#             - ghostscript-x
-#             - texlive-xetex
-#             - latexmk
-#             - libgconf2-4
-#             - texlive-fonts-recommended
-#             - texlive-fonts-extra
-#             - fonts-lmodern
-
-#       before_install:
-#         - luatex -v
-#         - pdflatex -v
-#       script:
-#         - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(name="LogicCircuits")); Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate();'
-#         - julia --project=docs/ docs/make.jl
-#       after_success: skip
-
 notifications:
   email: false
   slack:

Artifacts.toml

@@ -7,10 +7,9 @@ lazy = true
     sha256 = "5d66a95037e44010502ad28ec8d6dc26f46947dc88e962633b7de54e614b1a47"
 
 [circuit_model_zoo]
-git-tree-sha1 = "6a80001f3f4f9c41eb9ce4b63caf9555e08265de"
+git-tree-sha1 = "49e3a134c68acbcd87075dee811aff997c29cad2"
 lazy = true
 
  [[circuit_model_zoo.download]]
-    url = "https://github.com/UCLA-StarAI/Circuit-Model-Zoo/archive/v0.1.2.tar.gz"
-    sha256 = "e9710a8edd63a7f51dcb10b076f331e71eb5f34e0c878d8687f4e86b9df3249a"
-
+    url = "https://github.com/UCLA-StarAI/Circuit-Model-Zoo/archive/v0.1.3.tar.gz"
+    sha256 = "537d4d414b8955e8f9b64e4e3aaf5382889a6901c5e24aa9bc8bc2fbea51dc4f"

README_DEV.md

@@ -49,3 +49,17 @@ Only do this for when the repo is in stable position, and we have decent amount
     - The web interface seems to be the easiest. Follow the instructions in the generated pull request and make sure there is no errors. For example [this pull request](https://github.com/JuliaRegistries/General/pull/15350).
 3. Github Release. TagBot is enabled for this repo, so after the registrator merges the pull request, TagBot automatically does a github release in sync with the registrar's new version. 
    - Note: TagBot would automatically include all the closed PRs and issues since the previous version in the release note, if you want to exclude some of them, refer to [Julia TagBot docs](https://github.com/JuliaRegistries/TagBot).
+
+
+## Updating Artifacts
+
+The example is for Circuit Model Zoo, but should work for others:
+
+1. Push new updates to [UCLA-StarAI/Circuit-Model-Zoo](https://github.com/UCLA-StarAI/Circuit-Model-Zoo)
+2. Do a [new release](https://github.com/UCLA-StarAI/Circuit-Model-Zoo/releases).
+3. Update the `LogicCircuits.jl`'s `Artifact.toml` file with new git tag and hash. Example commit can be found [here](https://github.com/Juice-jl/LogicCircuits.jl/commit/1cd3fda02fa7bd82d1fa02898ee404edce0d7b14).
+4. Do the same for `ProbabilisticCircuits.jl`'s `Artifact.toml` file. Example commit [here](https://github.com/Juice-jl/ProbabilisticCircuits.jl/commit/da7d3678b5f2254e60229632f74cc619505e2b2d).
+
+### Question: How to get the hashes:
+1. `git-tree-sha1`. I thought it was the commit hash but that did not work. Instead can run the tests and then it gives you error with correct hash and you can update the hash based on that.
+2. `sha256`. Download the release file '*.tar.gz' and compute its SHA256 with any method you like and the replace the value.

src/LoadSave/circuit_loaders.jl

@@ -14,7 +14,9 @@ zoo_lc(name, num_classes) =
     load_logistic_circuit(zoo_lc_file(name), num_classes)
 
 zoo_clt_file(name) = 
-    artifact"circuit_model_zoo" * "/Circuit-Model-Zoo-0.1.2/clts/$name"
+    # artifact"circuit_model_zoo/" * "Circuit-Model-Zoo-0.1.3" * "/clts/$name"
+    artifact"circuit_model_zoo" * LogicCircuits.LoadSave.zoo_version * "/clts/$name"
+    
 
 zoo_clt(name) = 
     parse_clt(zoo_clt_file(name))