From 5723fd54c9550757eb07ef84c1a92a46077c2805 Mon Sep 17 00:00:00 2001 From: rayyildiz Date: Sun, 10 Sep 2017 17:27:19 +0200 Subject: [PATCH] Cross scala build support (#15) * Merge branch 'master' of https://github.com/marufaytekin/lsh-spark # Conflicts: # .gitignore # .travis.yml # README.md # build.sbt # src/main/resources/log4j.properties # src/main/scala/com/lendap/lsh/Hasher.scala # src/main/scala/com/lendap/lsh/LSHModel.scala # src/main/scala/com/lendap/lsh/Main.scala * added travis scala cross builds * initial commit * initial commit * initial commit * rndRDD changes * rndRDD changes * initial commit * initial commit * prediction added. * added data * initial commit * intellij files removed. * License added. * initial commit * rndRDD changes * added data * load and save added * intellij files removed. * - updated readme. - license file added.. * cosine similarity calculation added. * Cosine similarity usage added to readme.md. * - Package structure changed. - band term replaced with hash table. * added properties * Delete unnecessary files * groupId changed to "lendapp" Signed-off-by: Ramazan Ayyildiz * removed recomndation package. --- .gitignore | 3 +-- .travis.yml | 6 ++++- LICENSE.txt => LICENSE | 0 README.md | 2 ++ build.sbt | 14 ++++-------- project/Dependencies.scala | 22 +++++++++++++++++++ project/Settings.scala | 21 ++++++++++++++++++ project/build.properties | 1 + .../lendap/spark/lsh/LocalSparkContext.scala | 3 +-- 9 files changed, 57 insertions(+), 15 deletions(-) rename LICENSE.txt => LICENSE (100%) create mode 100644 project/Dependencies.scala create mode 100644 project/Settings.scala create mode 100644 project/build.properties diff --git a/.gitignore b/.gitignore index c816093..32a71ac 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,7 @@ project/plugins/project/ # Scala-IDE specific .scala_dependencies -/data/ml-1m.data .worksheet .idea/* -*.iml + diff --git a/.travis.yml b/.travis.yml index 911b5ec..5ed3b8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ language: scala scala: - 2.10.4 + - 2.11.7 + - 2.11.8 + - 2.11.10 + - 2.11.11 jdk: - openjdk7 - - openjdk6 + - openjdk8 sudo: false script: - sbt -jvm-opts travis/jvmopts.compile compile diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/README.md b/README.md index 485d34a..239e6b4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Locality Sensitive Hashing for Apache Spark # +[![Build Status](https://travis-ci.org/marufaytekin/lsh-spark.svg?branch=master)](https://travis-ci.org/marufaytekin/lsh-spark) + Locality-sensitive hashing (LSH) is an approximate nearest neighbor search and clustering method for high dimensional data points (http://www.mit.edu/~andoni/LSH/). Locality-Sensitive functions diff --git a/build.sbt b/build.sbt index 1fba8af..52599b0 100644 --- a/build.sbt +++ b/build.sbt @@ -1,11 +1,5 @@ -name := "lsh-scala" -version := "0.0.1-SNAPSHOT" - -scalaVersion := "2.10.4" - -libraryDependencies += "org.apache.spark" % "spark-core_2.10" % "1.4.1" - -libraryDependencies += "org.apache.spark" % "spark-mllib_2.10" % "1.4.1" - -libraryDependencies += "org.scalatest" % "scalatest_2.10" % "2.1.3" % "test" \ No newline at end of file +lazy val lsh = (project in file(".")). + settings(Settings.settings: _*). + settings(Settings.lshSettings: _*). + settings(libraryDependencies ++=Dependencies.lshDependencies ) \ No newline at end of file diff --git a/project/Dependencies.scala b/project/Dependencies.scala new file mode 100644 index 0000000..b02d485 --- /dev/null +++ b/project/Dependencies.scala @@ -0,0 +1,22 @@ +import sbt._ + +object Dependencies { + + lazy val version = new { + val scalaTest = "2.2.2" + val spark = "1.4.1" + } + + lazy val library = new { + val sparkCore ="org.apache.spark" %% "spark-core" % version.spark + val sparkMLib ="org.apache.spark" %% "spark-mllib" % version.spark + val test = "org.scalatest" %% "scalatest" % version.scalaTest % Test + } + + val lshDependencies: Seq[ModuleID] = Seq( + library.sparkCore, + library.sparkMLib, + library.test + ) + +} diff --git a/project/Settings.scala b/project/Settings.scala new file mode 100644 index 0000000..a4f5cb5 --- /dev/null +++ b/project/Settings.scala @@ -0,0 +1,21 @@ +import sbt._ +import Keys._ + +object Settings { + lazy val settings = Seq( + organization := "com.lendap", + version := "0.1." + sys.props.getOrElse("buildNumber", default="0-SNAPSHOT"), + scalaVersion := "2.10.4", + publishMavenStyle := true, + publishArtifact in Test := false + ) + + lazy val testSettings = Seq( + fork in Test := false, + parallelExecution in Test := false + ) + + lazy val lshSettings = Seq( + name := "lsh-scala" + ) +} diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 0000000..cf19fd0 --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.15 \ No newline at end of file diff --git a/src/test/scala/com/lendap/spark/lsh/LocalSparkContext.scala b/src/test/scala/com/lendap/spark/lsh/LocalSparkContext.scala index a4199f8..0e2bd63 100644 --- a/src/test/scala/com/lendap/spark/lsh/LocalSparkContext.scala +++ b/src/test/scala/com/lendap/spark/lsh/LocalSparkContext.scala @@ -14,7 +14,7 @@ trait LocalSparkContext extends BeforeAndAfterAll { self: Suite => override def beforeAll() { val conf = new SparkConf() .setMaster("local") - .setAppName("lsh-test") + .setAppName("test") sc = new SparkContext(conf) super.beforeAll() } @@ -25,5 +25,4 @@ trait LocalSparkContext extends BeforeAndAfterAll { self: Suite => } super.afterAll() } - }