Skip to content

WIP: Adding SRL #215

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.

Sign up for GitHub

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

Open
wants to merge 127 commits into
base: master
Choose a base branch
from
Open

WIP: Adding SRL #215

Changes from 1 commit
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
53c4ee1
Initial commit
christos-c Dec 12, 2014
d31108b
Added pom.xml back to git
christos-c Dec 12, 2014
ddef851
nlp-pipeline integration fully functional
christos-c Dec 22, 2014
7e0add5
Fixed an error in the WSJ train/dev sections split
christos-c Dec 31, 2014
e94d688
Minor changes
christos-c Jan 27, 2015
794bd04
Added JUnit tests
christos-c May 13, 2015
6eeded1
Declared gurobi optional
christos-c May 13, 2015
9bee145
Reverted back to nlp-pipeline-0.1.1
christos-c May 21, 2015
93352eb
Fixed bug in TextPreProcessor
christos-c May 21, 2015
80fd99e
Fixed dash ('-') bug in Nom SRL
christos-c Jul 7, 2015
e766eb4
Added an option for max inference rounds
christos-c Jul 8, 2015
09216e6
Added sense description ("name") to FrameData
christos-c Jul 21, 2015
0bd5517
Merge remote-tracking branch 'origin/master'
christos-c Jul 21, 2015
4a15867
moving to new deps 1
shyamupa Sep 29, 2015
80a30f0
moving to new deps 2
shyamupa Sep 29, 2015
b011ba6
moving to new deps 3
shyamupa Sep 29, 2015
da09783
final moving all to new deps 4
shyamupa Sep 29, 2015
39b1a5e
adding column writer from old edison
shyamupa Sep 29, 2015
527ac81
should compile. v5.1.3
shyamupa Sep 29, 2015
e9a68aa
WIP for moving to new dep.
shyamupa Sep 30, 2015
f322db1
which inference to use?
shyamupa Sep 30, 2015
400d6fa
compiles
shyamupa Sep 30, 2015
8a088e3
config madness. Need one config? or many?
shyamupa Sep 30, 2015
39993e1
New config for pipeline
christos-c Sep 30, 2015
dd07d30
this version goes upto feature extraction smoothly
shyamupa Oct 1, 2015
8dbadf3
can train sense still training identifier
shyamupa Oct 2, 2015
3722c3e
also try SP
shyamupa Oct 6, 2015
2afb706
confiugrable learner
shyamupa Oct 6, 2015
2386ec7
adding learner config
shyamupa Oct 7, 2015
e744814
all models trained!
shyamupa Oct 11, 2015
760b95f
working version with illinois-sl. v.5.1.4
shyamupa Oct 11, 2015
b8d34db
config now points to my models
shyamupa Oct 11, 2015
75db17e
tested interactively
shyamupa Oct 12, 2015
e46916b
turned off -ea for assertions.
shyamupa Oct 13, 2015
f881cff
Cleaning up
christos-c Oct 14, 2015
ae4e3ce
no nom model now
shyamupa Oct 15, 2015
7e2c3e7
Massive cleaning up
christos-c Oct 21, 2015
ae89da4
Completed README
christos-c Oct 21, 2015
9c03a57
Merge branch 'shyam' into 'master'
christos-c Oct 21, 2015
ee4fa4b
Added license
christos-c Oct 22, 2015
a645b1b
modifying srllabler init method, also adding getDescription in framem…
shyamupa Oct 22, 2015
a12aaf6
updating pom to 5.1.5
shyamupa Oct 22, 2015
c79f40f
Merge branch 'shyam'
shyamupa Oct 22, 2015
d1ed497
adding arg to factory client. mvn test passes now
shyamupa Oct 22, 2015
d693602
reverting change from last push
shyamupa Oct 22, 2015
550d228
all should be fixed now
shyamupa Oct 22, 2015
5ea7da9
Updated to illinois-cogcomp-nlp dependencies
christos-c Oct 23, 2015
c60c57b
numFeat threads as config param
shyamupa Nov 2, 2015
803bb24
moves to 5.1.6 still using models from 5.1.5
shyamupa Nov 2, 2015
4c98921
Merge branch 'threads' into 'master'
christos-c Nov 2, 2015
7f4d3b6
two config madness handled
shyamupa Nov 2, 2015
091cfde
Merge branch 'newthreads' into 'master'
christos-c Nov 2, 2015
99e7875
Updated Edison dependency
christos-c Nov 3, 2015
1260b53
new models
shyamupa Nov 3, 2015
6bfb3fa
Merge branch 'sshyam' into 'master'
shyamupa Nov 3, 2015
79de23f
Removed jwnl config file dependency
christos-c Nov 19, 2015
6827469
Updated models version
christos-c Nov 19, 2015
2923071
Updated dependencies versions
christos-c Nov 19, 2015
122767c
Merge branch 'christos-pipeline-fix' into 'master'
christos-c Nov 23, 2015
e191bdf
Created a bypass for getting top-k predictions before the ILP
christos-c Dec 8, 2015
298fa23
Removed pred-arg evaluator
christos-c Dec 9, 2015
a17d815
updated to follow changes to Annotator API
Dec 21, 2015
5c1306b
added Configurators for SRL to replace previous configuration code, b…
Dec 21, 2015
1db66f9
added minimal documentation to new classes
Dec 21, 2015
6890b3d
changed SRLProperties to use Configurators; if a file name is given, …
Dec 22, 2015
9053fbb
updated TextPreProcessor configuration to match SRL config
Dec 22, 2015
a8e3f30
updated SRL with constructor with no config file
Dec 22, 2015
4a3f0e1
updated SRL constructors to use ResourceManagers
Dec 22, 2015
db4f56d
updated SRL constructors to use ResourceManagers *correctly*
Dec 22, 2015
d94ab6b
Trying to make SRL conform to expected Annotator behavior, using View…
Dec 22, 2015
8c5b106
Minor changes for pipeline support
christos-c Dec 23, 2015
b518ebf
Fixed minor logging error
christos-c Dec 23, 2015
4d9070a
Merge remote-tracking branch 'remotes/origin/christos-ilp-updates' in…
Dec 25, 2015
48e310d
Merge branch 'mssammon' into 'master'
Dec 25, 2015
a2c9f40
Updated to latest dependencies
christos-c Jan 17, 2016
d9c1eec
Merge branch 'christos-update' into 'master'
Jan 17, 2016
9a58721
Fixed NOMLEX reader bug
christos-c Jan 31, 2016
c07c1a1
Updated models usage
christos-c Feb 1, 2016
fbd5602
updated version
Feb 1, 2016
62fe36c
fixed bug with incorrect package name
Feb 1, 2016
a31d438
Small changes
christos-c Feb 20, 2016
1e0b6f6
Removed prop/nombank dependence during inference
christos-c Mar 28, 2016
5bca95d
Merge branch 'christos-prop-nom-fix' into 'master'
Mar 28, 2016
0459b97
Fixed Windows-specific JWNL problem
christos-c Apr 12, 2016
e2ce6a5
Added Windows script
christos-c Apr 12, 2016
52cc455
Added ILP Solver as a property
christos-c Apr 12, 2016
025e7df
Added GitLab CI script
christos-c Apr 12, 2016
82040ec
Fixed unit tests
christos-c Apr 12, 2016
75de089
Added CI badge
christos-c Apr 12, 2016
5c6c99c
Merge remote-tracking branch 'origin/master' into christos-win
christos-c Apr 12, 2016
396de0d
Updated README and linux script
christos-c Apr 12, 2016
5722539
Merge branch 'christos-win' into 'master'
christos-c Apr 12, 2016
2a04ebc
Removed CI badge
christos-c Apr 12, 2016
976f288
Update README.md
christos-c May 2, 2016
d444a13
upgrade SL dependency
May 4, 2016
3998c95
Merge branch 'daniel_sl_dependency_upgrade' into 'master'
christos-c May 4, 2016
15cd5fd
Fixed typo in feature definition
christos-c May 4, 2016
13e2746
Increment version
christos-c May 4, 2016
691aac5
Fixed interactive Bash script
christos-c Jun 10, 2016
ae71b69
Updated cogcomp-nlp & pipeline deps
christos-c Aug 1, 2016
1161b78
Fixed bug in PropBank legal args list creation
christos-c Aug 1, 2016
d6f68c2
Incremented version
christos-c Aug 1, 2016
b016cc6
updated to use updated Annotator API, which accommodates lazy initial…
Aug 12, 2016
4a60b49
added test to try to monitor memory use with repeated instantiation o…
Aug 13, 2016
662afdd
updated to check for/add CLAUSE_STANFORD view before trying to apply …
Aug 14, 2016
2a98e89
updated icu dependency to non-snapshot
Aug 14, 2016
357fd39
updated pipeline dependency
Aug 15, 2016
f5b0df0
Merge branch 'icuupdate' into 'master'
Aug 16, 2016
d23369b
updated version number
Aug 16, 2016
a008507
Merge branch 'icuupdate' into 'master'
Aug 16, 2016
1f6beab
moving the files into the srl folder
Sep 20, 2016
2ab580c
Merge remote-tracking branch 'cogcomp/master'
Sep 20, 2016
458b844
adding srl to the main pom file.
Sep 20, 2016
6813089
update readme file
Sep 20, 2016
de4dab6
remove gitlab-ci file.
Sep 20, 2016
901998f
adding license header to the srl files.
Sep 20, 2016
2653065
Merge remote-tracking branch 'cogcomp/master'
Sep 22, 2016
960e5c1
applying comments: updated pom file and removed some redundant files.
Sep 22, 2016
90f920e
applying formatter on SRL.
Sep 22, 2016
8907a86
dropping two old fex files.
Sep 22, 2016
f196fe4
adding a memory condition to srl tests.
Sep 22, 2016
fd97201
increase memory requirement for srl tests to 8gb.
Sep 22, 2016
f292cde
drop curator release components.
Sep 22, 2016
084d0ba
some clean up for pom.xml.
Oct 13, 2016
7c40a69
Merge remote-tracking branch 'upstream/master' into adding-srl
christos-c Oct 14, 2016
24ba53e
Changed SRL's TA cache mechanism
christos-c Oct 14, 2016
8252cb9
do not initialize multiple caches.
Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions srl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,63 +53,70 @@
<artifactId>illinois-core-utilities</artifactId>
<version>3.0.73</version>
</dependency>

<dependency>
<groupId>edu.illinois.cs.cogcomp</groupId>
<artifactId>illinois-curator</artifactId>
<version>3.0.73</version>
</dependency>

<dependency>
<groupId>edu.illinois.cs.cogcomp</groupId>
<artifactId>illinois-edison</artifactId>
<version>3.0.73</version>
</dependency>

<dependency>
<groupId>com.gurobi</groupId>
<artifactId>gurobi</artifactId>
<version>6.5</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>edu.illinois.cs.cogcomp</groupId>
<artifactId>illinois-common-resources</artifactId>
<classifier>illinoisSRL</classifier>
Copy link
Member

Choose a reason for hiding this comment

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

Note the use of the classifier in case this needs to be addressed (see #43)

Copy link
Member Author

Choose a reason for hiding this comment

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

huh? I am not clean on the classifier tag usage here ...

Copy link
Member

Choose a reason for hiding this comment

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

I was using the classifier property to split the common-resources per project. Each project would use its own subunit of the common resources module.

Copy link
Member Author

@danyaljj danyaljj Sep 29, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

screen shot 2016-09-29 at 1 29 46 pm

1.3 is the one currently used in Edison and 1.4 is the one used in SRL. There is an effort to break the resources into smaller jar files. I can update it after that.

<version>1.4</version>
</dependency>

<dependency>
<groupId>edu.illinois.cs.cogcomp</groupId>
<artifactId>illinois-common-resources</artifactId>
<classifier>illinoisSRL</classifier>
<version>1.5</version>
</dependency>
<dependency>
<groupId>edu.illinois.cs.cogcomp</groupId>
<artifactId>illinois-common-resources</artifactId>
<version>1.5</version>
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need both the general illinois-common-resources, as well as the srl and the ner ones? The appropriate solution would be to pack everything we need into the srl common-resources.

</dependency>
<dependency>
<groupId>edu.illinois.cs.cogcomp</groupId>
<artifactId>illinois-common-resources</artifactId>
<classifier>ner</classifier>
<version>1.5</version>
</dependency>
<dependency>
<groupId>edu.illinois.cs.cogcomp</groupId>
<artifactId>illinois-sl-core</artifactId>
<version>1.0.3</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.190</version>
</dependency>

<dependency>
<groupId>edu.illinois.cs.cogcomp</groupId>
<artifactId>illinois-inference</artifactId>
<version>0.6.0</version>
</dependency>

<dependency>
<groupId>org.tartarus</groupId>
<artifactId>snowball</artifactId>
<version>1.0</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down