Code

Quantifier learning#55

Code

Open

haberchr wants to merge 99 commits intoCLMBRs:mainCLMBRs/ultk:mainfrom haberchr:mainhaberchr/altk:mainCopy head branch name to clipboard

+8,498-5

Commits

Commits on Oct 31, 2023

• Initial work on quantifier example

  haberchr

  committed
  ac25c5b

  Copy full SHA for ac25c5b

Commits on Nov 4, 2023

• Subclass referents to make quantifiers, create universe with itertools

  haberchr

  committed
  3c07573

  Copy full SHA for 3c07573

Commits on Nov 9, 2023

• Merge main into learn_quant

  haberchr

  committed
  db19d07

  Copy full SHA for db19d07

• Add weights to grammar, add timer and results of timer with small generation results for comparison pre-changes

  haberchr

  committed
  0c56e06

  Copy full SHA for 0c56e06

• Add small generated expressions AFTER change with times

  haberchr

  committed
  7ea182f

  Copy full SHA for 7ea182f

• Merge branch 'main' into learn_quant

  haberchr

  committed
  5557404

  Copy full SHA for 5557404

• Generation results after Shane's fix

  haberchr

  committed
  a5697eb

  Copy full SHA for a5697eb

• Add generation times after edits

  haberchr

  committed
  e58b3d9

  Copy full SHA for e58b3d9

• Ensure elements of M may be any index in alien set in defined range(0, X)

  haberchr

  committed
  d7b6e6e

  Copy full SHA for d7b6e6e

Commits on Nov 11, 2023

• Remove X from QuantifierModel - names will not encode anymore the X from the universe from which a QuantifierModel was generated. Cleaned up generation scripts.

  haberchr

  committed
  ffaf43d

  Copy full SHA for ffaf43d

• Don't generate depth=1

  haberchr

  committed
  5fc0038

  Copy full SHA for 5fc0038

Commits on Nov 14, 2023

• Ensure universe has uniquely named referents - therefor, unique referents as name is based on properties of referent

  haberchr

  committed
  cda6fef

  Copy full SHA for cda6fef

• Generated at M=4 X=5 D=3 and still only outputs one expression

  haberchr

  committed
  4dfa9da

  Copy full SHA for 4dfa9da

Commits on Nov 16, 2023

• Converted sets to frozensets, set eq=True frozen=True for QuantifierModel dataclass args, successfully generated output

  haberchr

  committed
  72df8b0

  Copy full SHA for 72df8b0

Commits on Nov 20, 2023

• Add x_size to a subclass of Universe (QuantifierUniverse), begin MonotonicityMeasurer (still not implemented)

  haberchr

  committed
  dbf7bec

  Copy full SHA for dbf7bec

Commits on Nov 21, 2023

• Update monotonicity measurer

  haberchr

  committed
  a6881cc

  Copy full SHA for a6881cc

Commits on Nov 26, 2023

• Rules are added for primitives dynamically with new class QuantifierGrammar. QuantifierModel initialized only with name string. Minor bug fixes

  haberchr

  committed
  922de09

  Copy full SHA for 922de09

• Ensure that truth_values are only calculated dynamically in monotonicity measurement

  haberchr

  committed
  95585ba

  Copy full SHA for 95585ba

• Fix minor bugs; add iter method to grammar

  haberchr

  committed
  8b61e53

  Copy full SHA for 8b61e53

Commits on Nov 27, 2023

• Add tutorial beginning. TODO: monotonicity. Added fix to indexing in grammar creation of index primitive rules. Added default weight value of 2.0 for primitive indices

  haberchr

  committed
  62e56b4

  Copy full SHA for 62e56b4

Commits on Nov 28, 2023

• Minor progress on tutorial check in, minor changes toward using set operators for succinctness

  haberchr

  committed
  e02d2b9

  Copy full SHA for e02d2b9

• Update tutorial with monotonicity of specific expressions; check in generated expressions - can't seem to get more than two int rules to appear in gen exps

  haberchr

  committed
  35db091

  Copy full SHA for 35db091

• Add initial log file of upward monotonicity

  haberchr

  committed
  f69dfbc

  Copy full SHA for f69dfbc

• Comments

  haberchr

  committed
  70ce61f

  Copy full SHA for 70ce61f

Commits on Dec 15, 2023

• Minor changes

  

  Christopher Haberland

  authored and

  Christopher Haberland

  committed
  5e4e34e

  Copy full SHA for 5e4e34e

• Merge 'main' into 'learn_quant'

  

  Christopher Haberland

  authored and

  Christopher Haberland

  committed
  af0d87b

  Copy full SHA for af0d87b

Commits on Jan 26, 2024

• Ultk name change, add from_sets QuantifierModel method, add antimeaning property for GrammaticalExpression

  haberchr

  committed
  479e2ee

  Copy full SHA for 479e2ee

Commits on Feb 4, 2024

• Allow for merging universes, draw function for GrammaticalExpression, contains for Meaning, folder read of expressions + pkled Universe, generation with inclusive M sizes

  haberchr

  committed
  a8415ba

  Copy full SHA for a8415ba

Commits on Feb 5, 2024

• Roll in different generation procedures (inclusive universes, time trial... etc.) into 'generate_expressions.py'

  haberchr

  committed
  41abd08

  Copy full SHA for 41abd08

• No longer needed - now consolidated in 'generated_expressions.py'

  haberchr

  committed
  11bbf7c

  Copy full SHA for 11bbf7c

• Merge branch 'main' into learn_quant

  haberchr

  committed
  9f7a17f

  Copy full SHA for 9f7a17f

• Match main branch - correct language test

  haberchr

  committed
  26e4ca1

  Copy full SHA for 26e4ca1

Commits on Apr 24, 2024

• Merge branch 'main' into learn_quant

  haberchr

  authored
  36850ec

  Copy full SHA for 36850ec

• Merge pull request #3 from haberchr/learn_quant

  Show description for 0702a8e
  haberchr

  authored
  0702a8e

  Copy full SHA for 0702a8e

• Fix func bug

  haberchr

  committed
  e14367b

  Copy full SHA for e14367b

Commits on Apr 25, 2024

• Fix tuple(referents) bug to catch up with main, refactor monotonicity as a function, print grammar upon reading it

  haberchr

  committed
  1203109

  Copy full SHA for 1203109

Commits on Apr 28, 2024

• Add hydra commanands for generation, monotonicity measurement

  haberchr

  committed
  45fa077

  Copy full SHA for 45fa077

• Fix path issue, print after dynamically adding primitives for indices

  haberchr

  committed
  5475df3

  Copy full SHA for 5475df3

• Create function for converting QuantifierModel to a numpy array

  haberchr

  committed
  50f6057

  Copy full SHA for 50f6057

• change name of antimeaning to complement, remove extraneous 1st time load grammar import, print grammar in serial generations

  haberchr

  committed
  1344441

  Copy full SHA for 1344441

Commits on Apr 30, 2024

• Incorporate comments from PR review, run black

  haberchr

  committed
  9e6ef27

  Copy full SHA for 9e6ef27

Commits on May 9, 2024

• stage fix to calculate_lattice, add docstrings

  haberchr

  committed
  1859344

  Copy full SHA for 1859344

• Merge in working frozendict change from generic-meaning

  haberchr

  committed
  d1859d2

  Copy full SHA for d1859d2

• Fix change from 'referents' to 'mapping' in meaning

  haberchr

  committed
  f444a4b

  Copy full SHA for f444a4b

Commits on Jul 8, 2024

• Add binarizing functions, temporary work-in of frozendict, will solve merge conflict with Shane's new PR

  haberchr

  committed
  0ca5463

  Copy full SHA for 0ca5463

• Merge remote-tracking branch 'ultk/main'

  haberchr

  committed
  26c33c4

  Copy full SHA for 26c33c4

• Merge branch 'main' into learn_quant_new_dictmeaning

  haberchr

  committed
  f79ba59

  Copy full SHA for f79ba59

Commits on Jul 11, 2024

• Add monotonicity script + printout, get generation working again

  haberchr

  committed
  5974173

  Copy full SHA for 5974173

Commits on Sep 22, 2024

• Merge pull request #4 from CLMBRs/main

  Show description for f62cf5e
  haberchr

  authored
  f62cf5e

  Copy full SHA for f62cf5e

Commits on Sep 26, 2024

• Merge branch 'main' into mono

  haberchr

  committed
  3d149e6

  Copy full SHA for 3d149e6

Commits on Oct 7, 2024

• Training scripts for expression meanings. From mps to cpu, transformers to lstms, we got it all down here

  haberchr

  committed
  a3381c1

  Copy full SHA for a3381c1

Commits on Oct 12, 2024

• Check in

  haberchr

  committed
  254eaac

  Copy full SHA for 254eaac

Commits on Oct 13, 2024

• Check in lightning code

  haberchr

  committed
  b519bd5

  Copy full SHA for b519bd5

• Add lightning file

  haberchr

  committed
  ba90b4a

  Copy full SHA for ba90b4a

Commits on Oct 22, 2024

• Add on-the-fly sampling, get transformer training right, early stopping with val loss, entropy thresholding, kfold training runs

  haberchr

  committed
  c3ac263

  Copy full SHA for c3ac263

• Add random seeding and logging

  haberchr

  committed
  487ebae

  Copy full SHA for 487ebae

• Add Threshold early stopping, ensure that model args reflect generated / sampled data

  haberchr

  committed
  c13f984

  Copy full SHA for c13f984

Commits on Oct 23, 2024

• Improve / update tutorial

  haberchr

  committed
  d724be2

  Copy full SHA for d724be2

• Add the model config

  haberchr

  committed
  60912ce

  Copy full SHA for 60912ce

Commits on Oct 30, 2024

• mono check in

  haberchr

  committed
  a26331f

  Copy full SHA for a26331f

Commits on Nov 6, 2024

• Ensure output folders are correct / universe is saved correctly in time trial / inclusive / regular generation, allow for variable index grammar rules, handle errors in dataset creation correctly

  haberchr

  committed
  ac392b0

  Copy full SHA for ac392b0

• Try setting the artifact uri and tracking uri locally, explicitly. Still get error requiring https server

  

  Christopher Haberland

  committed
  c48acb7

  Copy full SHA for c48acb7

• change uri to http

  

  Christopher Haberland

  committed
  5b1a0f1

  Copy full SHA for 5b1a0f1

• Ensure that mlflow works at a given machine launched by srun

  

  Christopher Haberland

  committed
  54f656d

  Copy full SHA for 54f656d

Commits on Nov 14, 2024

• Allow decoupling of module-loaded grammar and not, allow for union of grammars, fix read_expressions, time trial flushes to file now, allow for flip of true structure random variable

  haberchr

  committed
  8d2137d

  Copy full SHA for 8d2137d

Commits on Nov 25, 2024

• refactor monotonicity functions to allow imports to training script

  haberchr

  committed
  578d8e0

  Copy full SHA for 578d8e0

Commits on Nov 26, 2024

• Add to readme, additional yaml checkin

  haberchr

  committed
  c1e0459

  Copy full SHA for c1e0459

Commits on Dec 7, 2024

• Add itertools import

  haberchr

  committed
  4d08da5

  Copy full SHA for 4d08da5

• Add iles necessary for typed primitive loading by module

  haberchr

  committed
  a27f3c6

  Copy full SHA for a27f3c6

• re-add tutorial back in

  haberchr

  committed
  17455e4

  Copy full SHA for 17455e4

• Merge pull request #6 from haberchr/save_progress

  Show description for b72c0e6
  haberchr

  authored
  b72c0e6

  Copy full SHA for b72c0e6

• Merge branch 'mlflow' into proxy_jump

  haberchr

  authored
  ffc5968

  Copy full SHA for ffc5968

• Merge pull request #5 from haberchr/proxy_jump

  Show description for 8a25666
  haberchr

  authored
  8a25666

  Copy full SHA for 8a25666

• Merge pull request #7 from CLMBRs/main

  Show description for e45d738
  haberchr

  authored
  e45d738

  Copy full SHA for e45d738

• Remove 'old' monotonicity script scratch

  haberchr

  committed
  ad6c681

  Copy full SHA for ad6c681

• Merge pull request #8 from haberchr/mlflow

  Show description for b752754
  haberchr

  authored
  b752754

  Copy full SHA for b752754

Commits on Dec 16, 2024

• Entropy calc fix

  haberchr

  committed
  d6d6331

  Copy full SHA for d6d6331

• Add reqs

  haberchr

  committed
  7c9cb32

  Copy full SHA for 7c9cb32

Commits on Jan 6, 2025

• Add mlflow connectivity check callback

  

  Christopher Haberland

  committed
  9393a9f

  Copy full SHA for 9393a9f

• Add hydra slurm scripts

  

  Christopher Haberland

  committed
  f8fe92f

  Copy full SHA for f8fe92f

• Add mlflow and postgres slurm scripts

  

  Christopher Haberland

  committed
  a8d2293

  Copy full SHA for a8d2293

Commits on Jan 19, 2025

• Generalize paths to base grammar and universe defaults

  haberchr

  committed
  fd46a83

  Copy full SHA for fd46a83

• Modify slurm config to utilize non-preemptible resources, modify slurm learning script to read quantifiers from a map to original expressions.yaml indices (to support random sampling)

  

  Christopher Haberland

  committed
  a6c4cbc

  Copy full SHA for a6c4cbc

• Add random 2k expressions sample index map

  

  Christopher Haberland

  committed
  03b6cee

  Copy full SHA for 03b6cee

• Clean up of imports, minor path generalization / altk->ultk

  

  Christopher Haberland

  committed
  414a843

  Copy full SHA for 414a843

• Modify README, get basic querying and plotting notebooks up

  haberchr

  committed
  6805e2a

  Copy full SHA for 6805e2a

• Path change

  haberchr

  committed
  e8ac197

  Copy full SHA for e8ac197

• Automated black formatting

  github-actions[bot]

  committed
  472076b

  Copy full SHA for 472076b

Commits on Jan 20, 2025

• Fix merge conflicts with main

  haberchr

  committed
  5f54255

  Copy full SHA for 5f54255

• Imports

  haberchr

  committed
  b80b133

  Copy full SHA for b80b133

• Merge pull request #10 from haberchr/submitit

  Show description for dbdfcea
  haberchr

  authored
  dbdfcea

  Copy full SHA for dbdfcea

Commits on Jan 23, 2025

• Delete pics in bad place

  haberchr

  committed
  eb4cc0d

  Copy full SHA for eb4cc0d

• Add to README

  haberchr

  committed
  51089e7

  Copy full SHA for 51089e7

• Modify tutorial a little

  haberchr

  committed
  c471a2d

  Copy full SHA for c471a2d

• Change config to expressions.yaml

  haberchr

  committed
  b9e4f1f

  Copy full SHA for b9e4f1f

• Add dummy mlflow, change location of create_universe function,

  haberchr

  committed
  74bb4bc

  Copy full SHA for 74bb4bc

• Clean config structure with grammar and universe under expressions, ensure lightning logger can also be turned into a dummy

  haberchr

  committed
  10a8463

  Copy full SHA for 10a8463

• Add figure

  haberchr

  committed
  858fde0

  Copy full SHA for 858fde0

• minor imports

  haberchr

  committed
  d930589

  Copy full SHA for d930589