Skip to content
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.

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

replace tab indent with spaces within Updaters #2

Open
wants to merge 386 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
386 commits
Select commit Hold shift + click to select a range
c5b39ec
loadDicts
jcanny Jul 20, 2013
7caf357
loadDicts
jcanny Jul 20, 2013
2756752
loadDicts
jcanny Jul 20, 2013
7aee0ec
loadDicts
jcanny Jul 20, 2013
67e2d02
Deal with synchronization problems in IDicts
jcanny Jul 21, 2013
ab7052d
Made all functions terminate synchronously
jcanny Jul 21, 2013
24d12e8
new stateful twitter scanner
jcanny Jul 22, 2013
fa0a190
stateful scanner
jcanny Jul 23, 2013
48dc916
new stateful twitter scanner
jcanny Jul 23, 2013
0cfbff8
new stateful twitter scanner
jcanny Jul 23, 2013
5f95b34
featurizer cleanup
jcanny Jul 23, 2013
123ed95
featurizer cleanup
jcanny Jul 23, 2013
903aa6c
featurizer cleanup
jcanny Jul 23, 2013
545fa38
featurizer cleanup
jcanny Jul 23, 2013
99009d7
featurizer cleanup
jcanny Jul 23, 2013
d6a733c
featurizer cleanup
jcanny Jul 23, 2013
dd60426
featurizer cleanup
jcanny Jul 23, 2013
e4cfaa9
featurizer cleanup
jcanny Jul 23, 2013
8ee1a6e
featurizer cleanup
jcanny Jul 23, 2013
983ffbe
SFilesDataSource
jcanny Jul 25, 2013
88b7eb5
SFilesDataSource
jcanny Jul 25, 2013
7142f2c
Featurizer fixes
jcanny Jul 25, 2013
7cc4221
Featurizer fixes
jcanny Jul 25, 2013
c36ee4b
Featurizer fixes
jcanny Jul 25, 2013
8e70391
fix userid merging
jcanny Jul 27, 2013
74fcc85
fix userid merging
jcanny Jul 27, 2013
10496a8
fix userid featurization
jcanny Jul 28, 2013
d780248
single-thread featurizer
jcanny Jul 30, 2013
6f3d031
rethreaded Featurizer
jcanny Jul 30, 2013
99cec29
single-threaded Featurizer
jcanny Jul 30, 2013
5deedd4
updates to FactorModel
jcanny Jul 30, 2013
e204cd8
new Learner
jcanny Jul 30, 2013
af47ad8
new NMF and LDA
jcanny Jul 31, 2013
1b4aad7
single-file datasource
jcanny Jul 31, 2013
e8b0e71
single-file datasource
jcanny Jul 31, 2013
420d336
Test LDA
jcanny Aug 1, 2013
b2735da
Test LDA
jcanny Aug 1, 2013
9a22b8b
Test LDA
jcanny Aug 1, 2013
55e6ca6
Test LDA
jcanny Aug 1, 2013
d50ed27
Test LDA
jcanny Aug 1, 2013
72e9a17
fixes to featurizer capcity
jcanny Aug 1, 2013
5093600
fix thread sleep problem with actors
jcanny Aug 1, 2013
0e198f6
fix thread sleep problem with actors
jcanny Aug 1, 2013
7cd31bc
fix thread sleep problem with actors
jcanny Aug 1, 2013
c4e2e60
fix thread sleep problem with actors
jcanny Aug 1, 2013
fbf2daa
fix thread sleep problem with actors
jcanny Aug 1, 2013
df3df41
randomized prefetch file order
jcanny Aug 1, 2013
611d8a3
randomized prefetch file order
jcanny Aug 1, 2013
1e58f2a
randomized prefetch file order
jcanny Aug 1, 2013
d8cc638
randomized prefetch file order
jcanny Aug 2, 2013
c47a343
randomized prefetch file order
jcanny Aug 2, 2013
025abb6
randomized prefetch file order
jcanny Aug 2, 2013
d4cc928
randomized prefetch file order
jcanny Aug 2, 2013
48426c6
Learner fixes
jcanny Aug 3, 2013
e5eb0e3
fixes to Learner
jcanny Aug 6, 2013
f9af57b
parallel Learner
jcanny Aug 7, 2013
217a075
parallel Learner
jcanny Aug 7, 2013
935a9ee
parallel Learner
jcanny Aug 7, 2013
57916a5
parallel Learner
jcanny Aug 7, 2013
b807984
parallel Learner
jcanny Aug 7, 2013
0ccbd70
parallel Learner
jcanny Aug 7, 2013
a72fb49
parallel Learner
jcanny Aug 7, 2013
c8f4ecc
updates
jcanny Aug 7, 2013
37daba8
updates
jcanny Aug 7, 2013
448e6ba
updates
jcanny Aug 7, 2013
17fd243
updates
jcanny Aug 7, 2013
16749eb
updates
jcanny Aug 7, 2013
ac4584e
updates
jcanny Aug 7, 2013
281be67
fix GPU constant problem
jcanny Aug 7, 2013
f121e50
fix GPU constant problem
jcanny Aug 7, 2013
601cc8f
fix GPU constant problem
jcanny Aug 7, 2013
7ed329b
fix GPU constant problem
jcanny Aug 7, 2013
0b940e0
fix GPU constant problem
jcanny Aug 7, 2013
4ac4e83
fix GPU cache problem
jcanny Aug 7, 2013
790ecae
spread out model updates
jcanny Aug 7, 2013
c4101bf
spread out model updates
jcanny Aug 7, 2013
d612414
spread out model updates
jcanny Aug 7, 2013
bef44d8
spread out model updates
jcanny Aug 7, 2013
4aa673f
synchronize cache updates
jcanny Aug 7, 2013
33ee69a
synchronize cache updates
jcanny Aug 7, 2013
db85c11
synchronize cache updates
jcanny Aug 7, 2013
2cc2114
synchronize cache updates
jcanny Aug 7, 2013
8b71a83
synchronize cache updates
jcanny Aug 7, 2013
3c036ec
fixing MT
jcanny Aug 8, 2013
2d1cf9b
fixing MT
jcanny Aug 8, 2013
678eaa3
fixing MT
jcanny Aug 8, 2013
e12a586
fixing MT
jcanny Aug 8, 2013
2a6d14e
Fixes to SMat uncompressInds
jcanny Aug 8, 2013
cda7eb7
Fixes to SMat uncompressInds
jcanny Aug 8, 2013
8e794f8
SFiles LDA
jcanny Aug 8, 2013
af7b0b8
SFiles LDA
jcanny Aug 8, 2013
74fff9b
SFiles LDA
jcanny Aug 8, 2013
857e7d1
SFiles LDA
jcanny Aug 8, 2013
8ad727a
SFiles LDA
jcanny Aug 8, 2013
f8f7eb6
SFiles LDA
jcanny Aug 8, 2013
b2e32bd
SFiles LDA
jcanny Aug 8, 2013
c5d878b
run experiment 1
jcanny Aug 8, 2013
2b8a9f6
run experiment 1
jcanny Aug 8, 2013
ba9b5cf
run experiment 1
jcanny Aug 8, 2013
110db4b
single-DS learner
jcanny Aug 8, 2013
c07e251
single-DS learner
jcanny Aug 8, 2013
8b941cf
fixes to par learner
jcanny Aug 9, 2013
b190a46
fixes to par learner
jcanny Aug 9, 2013
87c0557
cleanup
jcanny Aug 9, 2013
d1b14d4
cleanup
jcanny Aug 9, 2013
24fb470
incremental save on learner
jcanny Aug 10, 2013
6af7987
incremental save on learner
jcanny Aug 10, 2013
fb36320
warm start for learer
jcanny Aug 10, 2013
f3a8cab
merged newmodel
jcanny Aug 12, 2013
193c698
testing parlearnerx
jcanny Aug 15, 2013
408d020
testing parlearnerx
jcanny Aug 15, 2013
3cf5eee
testing parlearnerx
jcanny Aug 15, 2013
218f150
testing parlearnerx
jcanny Aug 15, 2013
7f216fc
added datasource test routines
jcanny Aug 15, 2013
fc91106
updated par learner
jcanny Aug 15, 2013
94061bd
updated par learner
jcanny Aug 15, 2013
05ce832
updated par learner
jcanny Aug 15, 2013
86b3c30
updated par learner
jcanny Aug 15, 2013
b1f8a11
updated par learner
jcanny Aug 15, 2013
531c6f1
updated par learner
jcanny Aug 15, 2013
29fc024
fix FParLearner
jcanny Aug 16, 2013
b1f56db
fix FParLearner
jcanny Aug 16, 2013
b8fa327
fix FParLearner
jcanny Aug 16, 2013
8aef276
fix FParLearner
jcanny Aug 16, 2013
2776a8d
fix FParLearner
jcanny Aug 16, 2013
95b8daf
fix FParLearner
jcanny Aug 16, 2013
c0678f1
fix FParLearner
jcanny Aug 16, 2013
e9b6b5d
ParLeaner and ParLearnerx using same update rate
jcanny Aug 16, 2013
646fb47
tweaks to Learner
jcanny Aug 16, 2013
6265378
added GLMmodel
jcanny Aug 16, 2013
77c4c19
BlendedDataSource
jcanny Aug 16, 2013
ed9b4d9
BlendedDataSource
jcanny Aug 16, 2013
6881627
Tweak TestFParLDA
jcanny Aug 16, 2013
a88c431
Tweak TestFParLDA
jcanny Aug 16, 2013
505f0c9
Cool Learners down
jcanny Aug 16, 2013
feaa8c5
Cool Learners down
jcanny Aug 16, 2013
fad6829
Cool Learners down
jcanny Aug 16, 2013
a2ea1ca
Check Learner GPUmem
jcanny Aug 18, 2013
2622ccd
Check Learner GPUmem
jcanny Aug 18, 2013
a8dc19c
Check Learner GPUmem
jcanny Aug 18, 2013
c9087dc
Restart on GPU crash
jcanny Aug 18, 2013
0529989
fixes to LDA and NMF
jcanny Aug 19, 2013
db169f5
fixes to LDA priors
jcanny Aug 19, 2013
936437b
fixes to LDA priors
jcanny Aug 19, 2013
d7a9da2
fixes to LDA priors
jcanny Aug 19, 2013
985f908
fixes to LDA priors
jcanny Aug 19, 2013
b0b415e
fixes to LDA priors
jcanny Aug 19, 2013
7135bf8
fixes to LDA priors
jcanny Aug 19, 2013
7f76b22
fixes to LDA priors
jcanny Aug 19, 2013
f5469c8
fixes to LDA priors
jcanny Aug 19, 2013
f05db9d
fixes to LDA priors
jcanny Aug 19, 2013
8f02538
LDA and NMF updaters working
jcanny Aug 19, 2013
2cd6c7f
TestFParNMFx
jcanny Aug 19, 2013
543a512
fix constant multiply bugs
jcanny Aug 19, 2013
8380089
fixes to constant multiples
jcanny Aug 19, 2013
2b2986d
double precision evaluation
jcanny Aug 19, 2013
3c9f030
double scoring
jcanny Aug 19, 2013
f62b0ff
General file and matrix Learners
jcanny Aug 19, 2013
bf663f6
merged general learners
jcanny Aug 19, 2013
46e733e
merged general learners
jcanny Aug 19, 2013
0208863
Telescoping Updater
jcanny Aug 19, 2013
1d36b11
Telescoping Updater
jcanny Aug 19, 2013
607762d
Telescoping Updater
jcanny Aug 20, 2013
309779d
Telescoping Updater
jcanny Aug 20, 2013
e1269f2
fixed bidmach scripts
jcanny Aug 20, 2013
d7b3228
fixed jar
jcanny Aug 20, 2013
0b4f40b
fix win script
jcanny Aug 20, 2013
f7252fa
refactored learners
jcanny Aug 21, 2013
f85cd86
refactored learners
jcanny Aug 21, 2013
7cca07c
find emoticons
jcanny Aug 21, 2013
17190eb
find emoticons
jcanny Aug 21, 2013
4fc5aba
find emoticons
jcanny Aug 21, 2013
51fe498
find emoticons
jcanny Aug 21, 2013
69a89d2
fix blendedDataSource
jcanny Aug 21, 2013
5e62551
fix blendedDataSource
jcanny Aug 21, 2013
f703bd6
fix blendedDataSource
jcanny Aug 21, 2013
76811c6
fix blendedDataSource
jcanny Aug 22, 2013
0ed76ca
fix blendedDataSource
jcanny Aug 22, 2013
b5f389f
fix blended source
jcanny Aug 22, 2013
24db210
fix blended source
jcanny Aug 22, 2013
b6349b0
fix blended source
jcanny Aug 22, 2013
0b7bbb7
blocked blended datasource
jcanny Aug 22, 2013
f440caa
refresh jar
jcanny Aug 22, 2013
9d6f21e
refresh jar
jcanny Aug 22, 2013
e7a79f5
refresh jar
jcanny Aug 22, 2013
39503a4
sampled datasources
jcanny Aug 22, 2013
838adfe
sampled datasources
jcanny Aug 22, 2013
6d47cf4
sampled datasources
jcanny Aug 22, 2013
ece80fe
sampled datasources
jcanny Aug 22, 2013
b7299e8
sampled datasources
jcanny Aug 22, 2013
88be2b4
gramDict builder
jcanny Aug 22, 2013
d6d8f1a
gramDict builder
jcanny Aug 22, 2013
98515ee
gramDict builder
jcanny Aug 22, 2013
b36441d
simplified learners
jcanny Aug 24, 2013
bfe64e2
updates to Learner
jcanny Aug 26, 2013
4c6e471
emoticons to alldict
jcanny Aug 29, 2013
5384b0a
emoticons to alldict
jcanny Aug 29, 2013
98912b3
emoticons to alldict
jcanny Aug 29, 2013
720239f
emoticons to alldict
jcanny Aug 29, 2013
0c15f4b
Twitter junk detection
jcanny Aug 29, 2013
47e8c03
Twitter junk detection
jcanny Aug 29, 2013
ba4b0d1
Twitter junk detection
jcanny Aug 29, 2013
fad13e5
Logistic model
jcanny Aug 30, 2013
cee4eb3
Logistic model
jcanny Aug 30, 2013
a200084
Logistic model
jcanny Aug 30, 2013
4212bec
Logistic model
jcanny Aug 30, 2013
09bcbc3
Logistic model
jcanny Aug 30, 2013
430b48f
Logistic model
jcanny Aug 30, 2013
5aa02f1
GLMmodel trace
jcanny Aug 30, 2013
7155f16
densemat row col slicing
jcanny Aug 30, 2013
92f51ab
fix sizeMargin
jcanny Aug 30, 2013
748b7c4
try simple GLM model
jcanny Aug 30, 2013
dffa56b
try simple GLM model
jcanny Aug 30, 2013
be2f6a3
try simple GLM model
jcanny Aug 30, 2013
cbab5ae
Linear regression working
jcanny Aug 30, 2013
aeaa1bb
removed learnModel
jcanny Aug 30, 2013
c65f35f
GLM working
jcanny Sep 1, 2013
3061f23
general score saving
jcanny Sep 6, 2013
6aeb631
general score saving
jcanny Sep 6, 2013
0bd069d
general score saving
jcanny Sep 6, 2013
dc7e7a5
parallel logistic regression
jcanny Sep 6, 2013
0716514
parallel logistic regression
jcanny Sep 6, 2013
b45c5db
parallel logistic regression
jcanny Sep 6, 2013
c3dc413
parallel logistic regression
jcanny Sep 6, 2013
90581bb
parallel logistic regression
jcanny Sep 6, 2013
c9c1cd8
parallel logistic regression
jcanny Sep 6, 2013
e10787b
parallel logistic regression
jcanny Sep 6, 2013
f874e9f
parallel logistic regression
jcanny Sep 6, 2013
0adc4ff
parallel logistic regression
jcanny Sep 6, 2013
c54aba7
added more par learner options
jcanny Sep 6, 2013
ce8e03a
matdatasource updates
jcanny Sep 15, 2013
7abb6c3
logistic model on SMat
jcanny Sep 15, 2013
ad75c5a
logistic model on SMat
jcanny Sep 15, 2013
4cb8293
logistic model on SMat
jcanny Sep 15, 2013
2681b66
logistic model on SMat
jcanny Sep 15, 2013
e237691
logistic model on SMat
jcanny Sep 15, 2013
e4e706f
logistic model on SMat
jcanny Sep 15, 2013
1fd856c
logistic model on SMat
jcanny Sep 15, 2013
862aa84
updates to NMFmodel and Learner
jcanny Dec 11, 2013
4426050
tweaked parameters
jcanny Dec 12, 2013
ce99a04
mixed options
jcanny Dec 13, 2013
cd13a9d
mixed options
jcanny Dec 13, 2013
30661c9
fixes to putback
jcanny Dec 14, 2013
93e0c41
fixes to ALSModel
jcanny Dec 15, 2013
063da4f
fixes to ALSModel and CGUpdater
jcanny Dec 15, 2013
3ca20e4
fixes to ALSModel
jcanny Dec 17, 2013
dbbe3a4
ALS partly working
jcanny Dec 18, 2013
64a4809
restructured BIDMach
jcanny Dec 18, 2013
f3a632c
replace the tab indent with spaces
Dec 26, 2013
837c370
add gitignore
Dec 26, 2013
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
16 changes: 16 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/scala"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/BIDMat"/>
<classpathentry kind="lib" path="C:/code/BIDMat/lib/jhdf5.jar"/>
<classpathentry kind="lib" path="C:/code/BIDMat/lib/ptplot.jar"/>
<classpathentry kind="lib" path="C:/code/BIDMat/lib/ptplotapplication.jar"/>
<classpathentry kind="lib" path="C:/code/BIDMat/lib/jcublas-0.5.0.jar"/>
<classpathentry kind="lib" path="C:/code/BIDMat/lib/jcuda-0.5.0.jar"/>
<classpathentry kind="lib" path="C:/code/BIDMat/lib/jcufft-0.5.0.jar"/>
<classpathentry kind="lib" path="C:/code/BIDMat/lib/jcurand-0.5.0.jar"/>
<classpathentry kind="lib" path="C:/code/BIDMat/lib/jcusparse-0.5.0.jar"/>
<classpathentry kind="output" path="target/scala-2.9.1/classes"/>
</classpath>
18 changes: 18 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>BIDMach</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.scala-ide.sdt.core.scalabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.scala-ide.sdt.core.scalanature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Binary file added BIDMach.jar
Binary file not shown.
25 changes: 25 additions & 0 deletions Copyright.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Copyright (c) 2012, Regents of the University of California
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the <organization> nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

37 changes: 37 additions & 0 deletions bidmach
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash
export JAVA_OPTS="-Xmx12G -Xms128M" # Set as much memory as possible
BIDMACH_ROOT="${BASH_SOURCE[0]}"
if [ ! `uname` = "Darwin" ]; then
BIDMACH_ROOT=`readlink -f "${BIDMACH_ROOT}"`
else
BIDMACH_ROOT=`readlink "${BIDMACH_ROOT}"`
fi
BIDMACH_ROOT=`dirname "$BIDMACH_ROOT"`
BIDMACH_ROOT="$( echo ${BIDMACH_ROOT} | sed s+/cygdrive/c+c:+ )"
BIDMAT_ROOT="${BIDMACH_ROOT}/../BIDMat" # Change if needed
# export JAVA_HOME="" # Set here if not set in environment
# Fix these if needed
JCUDA_VERSION="0.5.0"
JCUDA_LIBDIR="${BIDMAT_ROOT}/lib"
BIDLIB="${BIDMAT_ROOT}/lib"
LIBDIR=${BIDMACH_ROOT}/lib
if [ `uname` = "Darwin" ]; then
export DYLD_LIBRARY_PATH="${BIDMAT_ROOT}/lib:/usr/local/cuda/lib:${LD_LIBRARY_PATH}"
else
export LD_LIBRARY_PATH="${BIDMAT_ROOT}/lib:/usr/local/cuda/lib64:${LD_LIBRARY_PATH}"
fi

BIDMAT_LIBS="${BIDMAT_ROOT}/BIDMat.jar;${BIDLIB}/ptplot.jar;${BIDLIB}/ptplotapplication.jar;${BIDLIB}/jhdf5.jar;${BIDLIB}/commons-math3-3.1.1.jar;${BIDLIB}/lz4-1.1.2.jar"
JCUDA_LIBS="${JCUDA_LIBDIR}/jcuda-${JCUDA_VERSION}.jar;${JCUDA_LIBDIR}/jcublas-${JCUDA_VERSION}.jar;${JCUDA_LIBDIR}/jcufft-${JCUDA_VERSION}.jar;${JCUDA_LIBDIR}/jcurand-${JCUDA_VERSION}.jar;${JCUDA_LIBDIR}/jcusparse-${JCUDA_VERSION}.jar"

export ALL_LIBS="${BIDMACH_ROOT}/BIDMach.jar;${BIDMAT_LIBS};${JCUDA_LIBS};${JAVA_HOME}/lib/tools.jar"

if [ ! "$OS" = "Windows_NT" ]; then
export ALL_LIBS=`echo "${ALL_LIBS}" | sed 's/;/:/g'`
else
NEWPATH=`${BIDMAT_ROOT}/shortpath.bat "${CUDA_BIN_PATH}"`
NEWPATH=`echo $NEWPATH | sed 's_\\\\_/_g'`
JAVA_OPTS="-Djava.library.path=${BIDMAT_ROOT}/lib;${NEWPATH} "$JAVA_OPTS
fi

scala -nobootcp -cp "${ALL_LIBS}" -Yrepl-sync -i ${LIBDIR}/bidmach_init.scala
20 changes: 20 additions & 0 deletions bidmach.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
@ECHO OFF
:: Set JAVA_HOME here if not set in environment
:: SET JAVA_HOME=
:: Set as much memory as possible
(SET JAVA_OPTS=-Xmx12G -Xms128M)
:: Fix these if needed
SET JCUDA_VERSION=0.5.0
SET BIDLIB="%CD%\..\BIDMat\lib"
SET LIBDIR="%CD%\lib"
SET JCUDA_LIBDIR=%BIDLIB%
SET PATH=%BIDLIB%;%PATH%

SET BIDMACH_LIBS=%BIDLIB%\..\BIDMat.jar;%CD%\BIDMach.jar;%BIDLIB%\ptplot.jar;%BIDLIB%\ptplotapplication.jar;%BIDLIB%\jhdf5.jar;%BIDLIB%\commons-math3-3.1.1.jar;%BIDLIB%\lz4-1.1.2.jar

SET JCUDA_LIBS=%JCUDA_LIBDIR%\jcuda-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcublas-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcufft-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcurand-%JCUDA_VERSION%.jar;%JCUDA_LIBDIR%\jcusparse-%JCUDA_VERSION%.jar

SET ALL_LIBS=%BIDMACH_LIBS%;%JCUDA_LIBS%;%JAVA_HOME%\lib\tools.jar
:: echo %ALL_LIBS%

scala -nobootcp -cp "%ALL_LIBS%" -Yrepl-sync -i %LIBDIR%\bidmach_init.scala
40 changes: 40 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@

name := "BIDMach"

version := "0.1.0"

organization := "edu.berkeley.bid"

scalaVersion := "2.9.2"

resolvers ++= Seq(
"Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots/",
"Scala Mirror" at "https://oss.sonatype.org/content/repositories/releases/"
)

libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
deps :+ ("org.scala-lang" % "scala-compiler" % sv)
}

libraryDependencies += "org.scala-lang" % "jline" % "2.9.2"

libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % "test"

libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.9" % "test"

libraryDependencies += "junit" % "junit" % "4.5" % "test"

credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")

javacOptions ++= Seq("-source", "1.5", "-target", "1.5")

scalacOptions ++= Seq("-deprecation","-target:jvm-1.5")

initialCommands := scala.io.Source.fromFile("lib/bidmach_init.scala").getLines.mkString("\n")

javaOptions += "-Xmx12g"

//seq(ProguardPlugin.proguardSettings :_*)



10 changes: 10 additions & 0 deletions lib/bidmach_init.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import BIDMat.{BMat,CMat,CSMat,DMat,Dict,IDict,FMat,GMat,GIMat,GSMat,HMat,IMat,Mat,SMat,SDMat}
import BIDMat.MatFunctions._
import BIDMat.SciFunctions._
import BIDMat.Solvers._
import BIDMat.Plotting._
import BIDMach.{MatDataSource,FilesDataSource,SFilesDataSource,Learner,LDAModel,NMFModel}

Mat.checkMKL
Mat.checkCUDA

7 changes: 7 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-proguard-plugin" % (v+"-0.1.1"))

resolvers += "Proguard plugin repo" at "http://siasia.github.com/maven2"



Loading