From 282055b2e4055785436f53f95532000319f6726d Mon Sep 17 00:00:00 2001 From: Eriq Augustine Date: Mon, 13 Nov 2023 13:23:31 -0500 Subject: [PATCH 1/3] Fixed a PSL python requirement that was in the setup, but not the dev_requirements.txt. --- psl-python/dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psl-python/dev_requirements.txt b/psl-python/dev_requirements.txt index 88f3ef617..15ed9e824 100644 --- a/psl-python/dev_requirements.txt +++ b/psl-python/dev_requirements.txt @@ -1,4 +1,4 @@ -JPype1==1.4.0 +JPype1>=1.4.0 pandas>=0.24.1 twine>=1.13.0 wheel>=0.33.1 From 2cb46cf75f3cd85dfa3d55d9732bc0958d61594a Mon Sep 17 00:00:00 2001 From: Eriq Augustine Date: Sun, 4 Feb 2024 17:19:39 -0800 Subject: [PATCH 2/3] Updated CI versions. --- .github/workflows/main.yml | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 86f753310..83b7fbf3b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,29 +36,29 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Needs to be deep enough to hit the last tagged version. - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: adopt - name: Set up Python 3.7 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.7' - name: Cache Maven - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Cache Python Dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: ${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('psl-python/setup.py') }}-${{ hashFiles('psl-python/dev_requirements.txt') }}-${{ hashFiles('psl-python/optional_requirements.txt') }} @@ -75,7 +75,7 @@ jobs: run: tar cvf psl.tar */target - name: Upload Archived Build - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: psl path: psl.tar @@ -86,29 +86,29 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Needs to be deep enough to hit the last tagged version. - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: adopt - name: Set up Python 3.7 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.7' - name: Cache Maven - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Cache Python Dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: ${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('psl-python/setup.py') }}-${{ hashFiles('psl-python/dev_requirements.txt') }}-${{ hashFiles('psl-python/optional_requirements.txt') }} @@ -131,29 +131,29 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Needs to be deep enough to hit the last tagged version. - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: adopt - name: Set up Python 3.7 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.7' - name: Cache Maven - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Cache Python Dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: ${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('psl-python/setup.py') }}-${{ hashFiles('psl-python/dev_requirements.txt') }}-${{ hashFiles('psl-python/optional_requirements.txt') }} @@ -211,29 +211,29 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Needs to be deep enough to hit the last tagged version. - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java-version }} distribution: adopt - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Cache Maven - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-java${{ matrix.java-version }}-${{ hashFiles('**/pom.xml') }} - name: Cache Python Dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.pythonLocation }} key: ${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('psl-python/setup.py') }}-${{ hashFiles('psl-python/dev_requirements.txt') }}-${{ hashFiles('psl-python/optional_requirements.txt') }} From 93da581966fe80b1de3a7e2c833c0bdcc60980fb Mon Sep 17 00:00:00 2001 From: Eriq Augustine Date: Sun, 4 Feb 2024 17:27:41 -0800 Subject: [PATCH 3/3] Updated copyright year to 2024. --- NOTICE | 2 +- pom.xml | 2 +- psl-cli/pom.xml | 2 +- .../org/linqs/psl/cli/CommandLineLoader.java | 2 +- .../main/java/org/linqs/psl/cli/Launcher.java | 2 +- .../test/java/org/linqs/psl/cli/CLITest.java | 2 +- .../test/java/org/linqs/psl/cli/MiscTest.java | 2 +- .../psl/cli/SimpleAcquaintancesTest.java | 2 +- psl-core/pom.xml | 2 +- .../psl/application/ModelApplication.java | 2 +- .../inference/InferenceApplication.java | 2 +- .../inference/mpe/ADMMInference.java | 2 +- .../mpe/DistributedDualBCDInference.java | 2 +- .../inference/mpe/DualBCDInference.java | 2 +- .../mpe/GradientDescentInference.java | 2 +- .../inference/mpe/MPEInference.java | 2 +- .../inference/mpe/SGDInference.java | 2 +- .../inference/mpe/SGDStreamingInference.java | 2 +- .../inference/mpe/gurobi/GurobiInference.java | 2 +- .../learning/weight/TrainingMap.java | 2 +- .../weight/WeightLearningApplication.java | 2 +- .../weight/gradient/GradientDescent.java | 2 +- .../batchgenerator/BatchGenerator.java | 2 +- .../ConnectedComponentBatchGenerator.java | 2 +- .../batchgenerator/FullBatchGenerator.java | 2 +- .../batchgenerator/NeuralBatchGenerator.java | 2 +- .../minimizer/BinaryCrossEntropy.java | 2 +- .../weight/gradient/minimizer/Minimizer.java | 2 +- .../gradient/minimizer/SquaredError.java | 2 +- .../weight/gradient/optimalvalue/Energy.java | 2 +- .../gradient/optimalvalue/OptimalValue.java | 2 +- .../optimalvalue/StructuredPerceptron.java | 2 +- .../learning/weight/search/Hyperband.java | 2 +- .../learning/weight/search/WeightSampler.java | 2 +- .../bayesian/GaussianProcessKernel.java | 2 +- .../search/bayesian/GaussianProcessPrior.java | 2 +- .../search/bayesian/SquaredExpKernel.java | 2 +- .../weight/search/grid/BaseGridSearch.java | 2 +- .../grid/ContinuousRandomGridSearch.java | 2 +- .../weight/search/grid/GridSearch.java | 2 +- .../search/grid/GuidedRandomGridSearch.java | 2 +- .../weight/search/grid/RandomGridSearch.java | 2 +- .../java/org/linqs/psl/config/Config.java | 2 +- .../java/org/linqs/psl/config/Option.java | 2 +- .../java/org/linqs/psl/config/Options.java | 2 +- .../org/linqs/psl/database/AtomStore.java | 2 +- .../org/linqs/psl/database/DataStore.java | 2 +- .../java/org/linqs/psl/database/Database.java | 2 +- .../org/linqs/psl/database/DatabaseQuery.java | 2 +- .../org/linqs/psl/database/Partition.java | 2 +- .../PersistedAtomManagementException.java | 2 +- .../psl/database/PersistedAtomStore.java | 2 +- .../psl/database/QueryResultIterable.java | 2 +- .../java/org/linqs/psl/database/RawQuery.java | 2 +- .../org/linqs/psl/database/ResultList.java | 2 +- .../linqs/psl/database/loading/Inserter.java | 2 +- .../psl/database/rdbms/DataStoreMetadata.java | 2 +- .../linqs/psl/database/rdbms/Formula2SQL.java | 2 +- .../psl/database/rdbms/PredicateInfo.java | 2 +- .../psl/database/rdbms/RDBMSDataStore.java | 2 +- .../psl/database/rdbms/RDBMSDatabase.java | 2 +- .../psl/database/rdbms/RDBMSInserter.java | 2 +- .../psl/database/rdbms/RDBMSResultList.java | 2 +- .../database/rdbms/driver/DatabaseDriver.java | 2 +- .../rdbms/driver/H2DatabaseDriver.java | 2 +- .../rdbms/driver/PostgreSQLDriver.java | 2 +- .../database/rdbms/driver/SQLiteDriver.java | 2 +- .../psl/evaluation/EvaluationInstance.java | 2 +- .../evaluation/statistics/AUCEvaluator.java | 2 +- .../statistics/CategoricalEvaluator.java | 2 +- .../statistics/ContinuousEvaluator.java | 2 +- .../statistics/DiscreteEvaluator.java | 2 +- .../psl/evaluation/statistics/Evaluator.java | 2 +- .../org/linqs/psl/grounding/Grounding.java | 2 +- .../collective/CandidateGeneration.java | 2 +- .../grounding/collective/CandidateQuery.java | 2 +- .../collective/CandidateSearchNode.java | 2 +- .../psl/grounding/collective/Containment.java | 2 +- .../psl/grounding/collective/Coverage.java | 2 +- .../grounding/collective/SearchFringe.java | 2 +- .../main/java/org/linqs/psl/model/Model.java | 2 +- .../java/org/linqs/psl/model/atom/Atom.java | 2 +- .../org/linqs/psl/model/atom/GroundAtom.java | 2 +- .../linqs/psl/model/atom/ObservedAtom.java | 2 +- .../org/linqs/psl/model/atom/QueryAtom.java | 2 +- .../psl/model/atom/RandomVariableAtom.java | 2 +- .../psl/model/atom/UnmanagedObservedAtom.java | 2 +- .../atom/UnmanagedRandomVariableAtom.java | 2 +- .../org/linqs/psl/model/deep/DeepModel.java | 2 +- .../psl/model/deep/DeepModelPredicate.java | 2 +- .../model/formula/AbstractBranchFormula.java | 2 +- .../linqs/psl/model/formula/Conjunction.java | 2 +- .../linqs/psl/model/formula/Disjunction.java | 2 +- .../org/linqs/psl/model/formula/Formula.java | 2 +- .../psl/model/formula/FormulaAnalysis.java | 2 +- .../linqs/psl/model/formula/Implication.java | 2 +- .../org/linqs/psl/model/formula/Negation.java | 2 +- .../psl/model/function/ExternalFunction.java | 2 +- .../psl/model/predicate/DeepPredicate.java | 2 +- .../ExternalFunctionalPredicate.java | 2 +- .../model/predicate/FunctionalPredicate.java | 2 +- .../predicate/GroundingOnlyPredicate.java | 2 +- .../linqs/psl/model/predicate/Predicate.java | 2 +- .../model/predicate/StandardPredicate.java | 2 +- .../linqs/psl/model/rule/AbstractRule.java | 2 +- .../linqs/psl/model/rule/FakeGroundRule.java | 2 +- .../org/linqs/psl/model/rule/FakeRule.java | 2 +- .../org/linqs/psl/model/rule/GroundRule.java | 2 +- .../java/org/linqs/psl/model/rule/Rule.java | 2 +- .../psl/model/rule/UnweightedGroundRule.java | 2 +- .../linqs/psl/model/rule/UnweightedRule.java | 2 +- .../psl/model/rule/WeightedGroundRule.java | 2 +- .../linqs/psl/model/rule/WeightedRule.java | 2 +- .../arithmetic/AbstractArithmeticRule.java | 2 +- .../AbstractGroundArithmeticRule.java | 2 +- .../arithmetic/UnweightedArithmeticRule.java | 2 +- .../UnweightedGroundArithmeticRule.java | 2 +- .../arithmetic/WeightedArithmeticRule.java | 2 +- .../WeightedGroundArithmeticRule.java | 2 +- .../expression/ArithmeticRuleExpression.java | 2 +- .../arithmetic/expression/SummationAtom.java | 2 +- .../expression/SummationAtomOrAtom.java | 2 +- .../expression/SummationVariable.java | 2 +- .../expression/SummationVariableOrTerm.java | 2 +- .../expression/coefficient/Add.java | 2 +- .../coefficient/BinaryCoefficient.java | 2 +- .../expression/coefficient/Cardinality.java | 2 +- .../expression/coefficient/Coefficient.java | 2 +- .../coefficient/ConstantNumber.java | 2 +- .../expression/coefficient/Divide.java | 2 +- .../expression/coefficient/Max.java | 2 +- .../expression/coefficient/Min.java | 2 +- .../expression/coefficient/Multiply.java | 2 +- .../expression/coefficient/Subtract.java | 2 +- .../logical/AbstractGroundLogicalRule.java | 2 +- .../rule/logical/AbstractLogicalRule.java | 2 +- .../logical/UnweightedGroundLogicalRule.java | 2 +- .../rule/logical/UnweightedLogicalRule.java | 2 +- .../logical/WeightedGroundLogicalRule.java | 2 +- .../rule/logical/WeightedLogicalRule.java | 2 +- .../org/linqs/psl/model/term/Attribute.java | 2 +- .../org/linqs/psl/model/term/Constant.java | 2 +- .../linqs/psl/model/term/ConstantType.java | 2 +- .../linqs/psl/model/term/DoubleAttribute.java | 2 +- .../psl/model/term/IntegerAttribute.java | 2 +- .../linqs/psl/model/term/LongAttribute.java | 2 +- .../linqs/psl/model/term/StringAttribute.java | 2 +- .../java/org/linqs/psl/model/term/Term.java | 2 +- .../org/linqs/psl/model/term/UniqueIntID.java | 2 +- .../linqs/psl/model/term/UniqueStringID.java | 2 +- .../org/linqs/psl/model/term/Variable.java | 2 +- .../linqs/psl/model/term/VariableTypeMap.java | 2 +- .../psl/reasoner/ExecutableReasoner.java | 2 +- .../org/linqs/psl/reasoner/InitialValue.java | 2 +- .../java/org/linqs/psl/reasoner/Reasoner.java | 2 +- .../linqs/psl/reasoner/admm/ADMMReasoner.java | 2 +- .../reasoner/admm/term/ADMMObjectiveTerm.java | 2 +- .../reasoner/admm/term/ADMMTermGenerator.java | 2 +- .../psl/reasoner/admm/term/ADMMTermStore.java | 2 +- .../duallcqp/DistributedDualBCDReasoner.java | 2 +- .../reasoner/duallcqp/DualBCDReasoner.java | 2 +- .../reasoner/duallcqp/term/DualLCQPAtom.java | 2 +- .../duallcqp/term/DualLCQPObjectiveTerm.java | 2 +- .../duallcqp/term/DualLCQPTermGenerator.java | 2 +- .../duallcqp/term/DualLCQPTermStore.java | 2 +- .../psl/reasoner/function/ConstraintTerm.java | 2 +- .../reasoner/function/FunctionComparator.java | 2 +- .../psl/reasoner/function/FunctionTerm.java | 2 +- .../reasoner/function/GeneralFunction.java | 2 +- .../GradientDescentReasoner.java | 2 +- .../term/GradientDescentObjectiveTerm.java | 2 +- .../term/GradientDescentTermGenerator.java | 2 +- .../term/GradientDescentTermStore.java | 2 +- .../psl/reasoner/gurobi/GurobiReasoner.java | 2 +- .../gurobi/term/GurobiObjectiveTerm.java | 2 +- .../gurobi/term/GurobiTermGenerator.java | 2 +- .../reasoner/gurobi/term/GurobiTermStore.java | 2 +- .../linqs/psl/reasoner/sgd/SGDReasoner.java | 2 +- .../reasoner/sgd/term/SGDObjectiveTerm.java | 2 +- .../sgd/term/SGDStreamingCacheIterator.java | 2 +- .../term/SGDStreamingGroundingIterator.java | 2 +- .../sgd/term/SGDStreamingTermStore.java | 2 +- .../reasoner/sgd/term/SGDTermGenerator.java | 2 +- .../psl/reasoner/sgd/term/SGDTermStore.java | 2 +- .../psl/reasoner/term/DummyTermStore.java | 2 +- .../linqs/psl/reasoner/term/Hyperplane.java | 2 +- .../linqs/psl/reasoner/term/ReasonerTerm.java | 2 +- .../psl/reasoner/term/SimpleTermStore.java | 2 +- .../psl/reasoner/term/TermGenerator.java | 2 +- .../linqs/psl/reasoner/term/TermState.java | 2 +- .../linqs/psl/reasoner/term/TermStore.java | 2 +- .../streaming/StreamingCacheIterator.java | 2 +- .../streaming/StreamingGroundingIterator.java | 2 +- .../term/streaming/StreamingIterator.java | 2 +- .../term/streaming/StreamingTerm.java | 2 +- .../term/streaming/StreamingTermStore.java | 2 +- .../java/org/linqs/psl/util/ArrayUtils.java | 2 +- .../java/org/linqs/psl/util/BitUtils.java | 2 +- .../java/org/linqs/psl/util/FileUtils.java | 2 +- .../java/org/linqs/psl/util/FloatMatrix.java | 2 +- .../main/java/org/linqs/psl/util/Hash.java | 2 +- .../java/org/linqs/psl/util/HashCode.java | 2 +- .../org/linqs/psl/util/IteratorUtils.java | 2 +- .../java/org/linqs/psl/util/ListUtils.java | 2 +- .../main/java/org/linqs/psl/util/Logger.java | 2 +- .../java/org/linqs/psl/util/MathUtils.java | 2 +- .../java/org/linqs/psl/util/Parallel.java | 2 +- .../java/org/linqs/psl/util/RandUtils.java | 2 +- .../java/org/linqs/psl/util/Reflection.java | 2 +- .../java/org/linqs/psl/util/RuntimeStats.java | 2 +- .../java/org/linqs/psl/util/StringUtils.java | 2 +- .../java/org/linqs/psl/util/SystemUtils.java | 2 +- .../main/java/org/linqs/psl/util/Version.java | 2 +- .../application/inference/InferenceTest.java | 2 +- .../mpe/ADMMInferencePostgresTest.java | 2 +- .../mpe/ADMMInferenceSQLiteTest.java | 2 +- .../inference/mpe/ADMMInferenceTest.java | 2 +- .../mpe/DistributedDualBCDInferenceTest.java | 2 +- .../inference/mpe/DualBCDInferenceTest.java | 2 +- .../mpe/GradientDescentInferenceTest.java | 2 +- .../inference/mpe/MPEInferenceTest.java | 2 +- .../inference/mpe/SGDInferenceTest.java | 2 +- .../mpe/SGDStreamingInferenceTest.java | 2 +- .../mpe/gurobi/GurobiInferenceTest.java | 2 +- .../learning/weight/TrainingMapTest.java | 2 +- .../learning/weight/WeightLearningTest.java | 2 +- .../minimizer/BinaryCrossEntropyTest.java | 2 +- .../gradient/minimizer/SquaredErrorTest.java | 2 +- .../gradient/optimalvalue/EnergyTest.java | 2 +- .../StructuredPerceptronTest.java | 2 +- .../learning/weight/search/HyperbandTest.java | 2 +- .../weight/search/WeightSamplerTest.java | 2 +- .../bayesian/GaussianProcessPriorTest.java | 2 +- .../search/bayesian/SquaredExpKernelTest.java | 2 +- .../grid/GridSearchContinuousLossMAETest.java | 2 +- .../grid/GridSearchContinuousLossMSETest.java | 2 +- .../grid/GridSearchDiscreteLossTest.java | 2 +- .../weight/search/grid/GridSearchTest.java | 2 +- .../grid/GuidedRandomGridSearchTest.java | 2 +- .../search/grid/RandomGridSearchTest.java | 2 +- .../org/linqs/psl/database/DataStoreTest.java | 2 +- .../linqs/psl/database/DatabaseTestUtil.java | 2 +- ...ternalFunctionalPredicateDatabaseTest.java | 2 +- .../database/rdbms/BatchOperationsTest.java | 2 +- .../database/rdbms/DataStoreMetadataTest.java | 2 +- .../psl/database/rdbms/Formula2SQLTest.java | 2 +- .../psl/database/rdbms/H2DataStoreTest.java | 2 +- .../database/rdbms/PostgresDataStoreTest.java | 2 +- .../database/rdbms/RDBMSDataStoreTest.java | 2 +- .../database/rdbms/SQLiteDataStoreTest.java | 2 +- .../statistics/AUCEvaluatorTest.java | 2 +- .../statistics/CategoricalEvaluatorTest.java | 2 +- .../statistics/ContinuousEvaluatorTest.java | 2 +- .../statistics/DiscreteEvaluatorTest.java | 2 +- .../evaluation/statistics/EvaluatorTest.java | 2 +- .../org/linqs/psl/model/atom/AtomTest.java | 2 +- .../org/linqs/psl/model/formula/DNFTest.java | 2 +- .../model/formula/FormulaAnalysisTest.java | 2 +- .../linqs/psl/model/rule/GroundRuleTest.java | 2 +- .../psl/model/rule/RuleEqualityTest.java | 2 +- .../linqs/psl/model/rule/RuleStringTest.java | 2 +- .../AbstractArithmeticRuleTest.java | 2 +- .../ArithmeticRuleExpressionTest.java | 2 +- .../expression/SummationAtomTest.java | 2 +- .../coefficient/CoefficientTest.java | 2 +- .../rule/logical/AbstractLogicalRuleTest.java | 2 +- .../psl/reasoner/admm/ADMMReasonerTest.java | 2 +- .../admm/term/ADMMObjectiveTermTest.java | 2 +- .../psl/reasoner/sgd/SGDReasonerTest.java | 2 +- .../java/org/linqs/psl/test/PSLBaseTest.java | 2 +- .../java/org/linqs/psl/test/TestModel.java | 2 +- .../java/org/linqs/psl/util/BitUtilsTest.java | 2 +- .../org/linqs/psl/util/FloatMatrixTest.java | 2 +- .../org/linqs/psl/util/IteratorUtilsTest.java | 2 +- .../org/linqs/psl/util/RandUtilsTest.java | 2 +- .../org/linqs/psl/util/ReflectionTest.java | 2 +- .../java/org/linqs/psl/util/VersionTest.java | 2 +- psl-java/pom.xml | 2 +- .../org/linqs/psl/config/RuntimeOptions.java | 2 +- .../java/org/linqs/psl/java/PSLModel.java | 2 +- .../org/linqs/psl/runtime/GroundingAPI.java | 2 +- .../java/org/linqs/psl/runtime/Runtime.java | 2 +- .../org/linqs/psl/runtime/RuntimeConfig.java | 2 +- .../org/linqs/psl/runtime/RuntimeResult.java | 2 +- .../java/org/linqs/psl/java/PSLModelTest.java | 2 +- .../java/org/linqs/psl/runtime/MiscTest.java | 2 +- .../linqs/psl/runtime/RuntimeConfigTest.java | 2 +- .../org/linqs/psl/runtime/RuntimeTest.java | 2 +- .../java/org/linqs/psl/runtime/SignTest.java | 2 +- .../psl/runtime/SimpleAcquaintancesTest.java | 2 +- .../test/java/org/linqs/psl/test/PSLTest.java | 2 +- .../test/resources/sign/tensorflow_model.py | 117 +++++++++++++++++- psl-parser/pom.xml | 2 +- .../antlr4/org/linqs/psl/parser/antlr/PSL.g4 | 2 +- .../org/linqs/psl/parser/ModelLoader.java | 2 +- .../org/linqs/psl/parser/RulePartial.java | 2 +- .../java/org/linqs/psl/parser/LoaderTest.java | 2 +- .../org/linqs/psl/parser/ModelLoaderTest.java | 2 +- .../test/java/org/linqs/psl/test/PSLTest.java | 2 +- psl-python/__init__.py | 2 +- psl-python/pom.xml | 2 +- psl-python/pslpython/__init__.py | 2 +- psl-python/pslpython/deeppsl/__init__.py | 2 +- psl-python/pslpython/deeppsl/model.py | 2 +- psl-python/pslpython/deeppsl/server.py | 2 +- psl-python/pslpython/model.py | 2 +- psl-python/pslpython/partition.py | 2 +- psl-python/pslpython/predicate.py | 2 +- psl-python/pslpython/rule.py | 2 +- psl-python/pslpython/runtime.py | 2 +- psl-python/tests/python/base_test.py | 2 +- .../python/deeppsl/test_pytorch_models.py | 2 +- .../deeppsl/test_scikit_learn_models.py | 2 +- .../python/deeppsl/test_tensorflow_models.py | 2 +- psl-python/tests/python/test_model.py | 2 +- psl-python/tests/python/test_predicate.py | 2 +- psl-python/tests/python/test_rule.py | 2 +- .../resources/models/deeppsl/sign/data.py | 2 +- .../models/deeppsl/sign/pytorch_model.py | 2 +- .../models/deeppsl/sign/scikit_learn_model.py | 2 +- .../models/deeppsl/sign/tensorflow_model.py | 2 +- .../tests/resources/models/deeppsl/util.py | 2 +- psl-runtime/pom.xml | 2 +- .../java/org/linqs/psl/runtime/Dummy.java | 2 +- .../org/linqs/psl/runtime/package-info.java | 2 +- 325 files changed, 440 insertions(+), 325 deletions(-) mode change 120000 => 100755 psl-java/src/test/resources/sign/tensorflow_model.py diff --git a/NOTICE b/NOTICE index 6091a7aa8..314c40bdd 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ PSL Software Copyright 2011-2015 University of Maryland -Copyright 2013-2023 The Regents of the University of California +Copyright 2013-2024 The Regents of the University of California This product includes software developed by the University of Maryland and the University of California. diff --git a/pom.xml b/pom.xml index 122b1910b..debe5be2b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@