diff --git a/CHANGELOG.md b/CHANGELOG.md index c94f3a0..0c3043a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## 0.3.0 + +- Complete change of the interface ([PR](https://github.com/astrolabsoftware/spark3D/pull/108)). This includes: + - DataFrame API + - Extension of the Spark SQL module (new methods + implicits on DataFrame) + - Metadata are propagated (not just 3D coordinates). + - Seamless interface with Python +- Compiling against Apache Spark 2.3.2: fix incompatibilities ([PR](https://github.com/astrolabsoftware/spark3D/pull/107)) +- Website update: spark-fits version + vulnerability fix ([PR](https://github.com/astrolabsoftware/spark3D/pull/105)) +- Fix wrong angle definition in cartesian to spherical coordinate change! ([PR](https://github.com/astrolabsoftware/spark3D/pull/102)) + + ## 0.2.2 - Add the conversion from FITS file (single HDU) to parquet ([PR](https://github.com/astrolabsoftware/spark3D/pull/92)) diff --git a/README.md b/README.md index 5a3cca1..f51f4fd 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ - [07/2018] **Release**: version 0.1.3, 0.1.4, 0.1.5 - [08/2018] **Release**: version 0.2.0, 0.2.1 (pyspark3d) - [09/2018] **Release**: version 0.2.2 +- [11/2018] **Release**: version 0.3.0 (new DataFrame API)

diff --git a/build.sbt b/build.sbt index 8017f70..8367ca6 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import xerial.sbt.Sonatype._ lazy val root = (project in file(".")). settings( inThisBuild(List( - version := "0.2.2" + version := "0.3.0" )), // Name of the application name := "spark3D", @@ -46,7 +46,7 @@ lazy val root = (project in file(".")). "org.apache.spark" %% "spark-core" % "2.3.2" % "provided", "org.apache.spark" %% "spark-sql" % "2.3.2" % "provided", // For loading FITS files - "com.github.astrolabsoftware" %% "spark-fits" % "0.7.0", + "com.github.astrolabsoftware" %% "spark-fits" % "0.7.1", // "org.datasyslab" % "geospark" % "1.1.3", // Uncomment if you want to trigger visualisation // "com.github.haifengl" % "smile-plot" % "1.5.1", diff --git a/docs/01_installation.md b/docs/01_installation.md index 61e5c02..e754109 100644 --- a/docs/01_installation.md +++ b/docs/01_installation.md @@ -20,7 +20,7 @@ another version, feel free to contact us. In addition to Spark, the library has You can link spark3D to your project (either `spark-shell` or `spark-submit`) by specifying the coordinates: ```bash -toto:~$ spark-submit --packages "com.github.astrolabsoftware:spark3d_2.11:0.2.2" <...> +toto:~$ spark-submit --packages "com.github.astrolabsoftware:spark3d_2.11:0.3.0" <...> ``` It might not contain the latest features though (see *Building from source*). @@ -69,7 +69,7 @@ result on the screen, plus details of the coverage at First produce a jar of the spark3D library, and then launch a spark-shell by specifying the external dependencies: ```bash -toto:~$ JARS="target/scala-2.11/spark3d_2.11-0.2.2.jar,lib/jhealpix.jar" +toto:~$ JARS="target/scala-2.11/spark3d_2.11-0.3.0.jar,lib/jhealpix.jar" toto:~$ PACKAGES="com.github.astrolabsoftware:spark-fits_2.11:0.7.0" toto:~$ spark-shell --jars $JARS --packages $PACKAGES ``` @@ -83,7 +83,7 @@ scala> // etc... Note that if you make a fat jar (that is building with `sbt ++${SCALA_VERSION} assembly` and not `sbt ++${SCALA_VERSION} package`), you do not need to specify external dependencies as they are already included in the resulting jar: ```bash -toto:~$ FATJARS="target/scala-2.11/spark3D-assembly-0.2.2.jar" +toto:~$ FATJARS="target/scala-2.11/spark3D-assembly-0.3.0.jar" toto:~$ spark-shell --jars $FATJARS ``` @@ -188,7 +188,7 @@ and then launch a pyspark shell: ```bash toto:~$ PYSPARK_DRIVER_PYTHON=ipython pyspark \ - --jars /path/to/target/scala-2.11/spark3D-assembly-0.2.2.jar + --jars /path/to/target/scala-2.11/spark3D-assembly-0.3.0.jar ``` # Batch mode and provided examples diff --git a/docs/_pages/home.md b/docs/_pages/home.md index 2e4a8f5..fe275fd 100644 --- a/docs/_pages/home.md +++ b/docs/_pages/home.md @@ -8,7 +8,7 @@ header: cta_url: "/docs/installation/" caption: intro: - - excerpt: '

Spark extension for processing large-scale 3D data sets: Astrophysics, High Energy Physics, Meteorology, ...


Latest release v0.2.2' + - excerpt: '

Spark extension for processing large-scale 3D data sets: Astrophysics, High Energy Physics, Meteorology, ...


Latest release v0.3.0' excerpt: '{::nomarkdown} {:/nomarkdown}' feature_row: - image_path: diff --git a/pyspark3d/__init__.py b/pyspark3d/__init__.py index 45b255e..732b557 100644 --- a/pyspark3d/__init__.py +++ b/pyspark3d/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pyspark3d/checkers.py b/pyspark3d/checkers.py index d6a738b..b2d7b35 100644 --- a/pyspark3d/checkers.py +++ b/pyspark3d/checkers.py @@ -1,4 +1,4 @@ -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pyspark3d/converters.py b/pyspark3d/converters.py index c18f9f3..50bb971 100644 --- a/pyspark3d/converters.py +++ b/pyspark3d/converters.py @@ -1,4 +1,4 @@ -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pyspark3d/geometryObjects.py b/pyspark3d/geometryObjects.py index bdfd040..105522c 100644 --- a/pyspark3d/geometryObjects.py +++ b/pyspark3d/geometryObjects.py @@ -1,4 +1,4 @@ -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pyspark3d/pyspark3d_conf.py b/pyspark3d/pyspark3d_conf.py index 3b7475a..9c0bf90 100644 --- a/pyspark3d/pyspark3d_conf.py +++ b/pyspark3d/pyspark3d_conf.py @@ -1,4 +1,4 @@ -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pyspark3d/repartitioning.py b/pyspark3d/repartitioning.py index f4eaf02..d321cc8 100644 --- a/pyspark3d/repartitioning.py +++ b/pyspark3d/repartitioning.py @@ -1,4 +1,4 @@ -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pyspark3d/version.py b/pyspark3d/version.py index 82d034e..a2c1236 100644 --- a/pyspark3d/version.py +++ b/pyspark3d/version.py @@ -1,4 +1,4 @@ # pyspark3d and spark3D have the same version number -__version__ = "0.2.2" +__version__ = "0.3.0" __scala_version__ = "2.11" __scala_version_all__ = "2.11.8" diff --git a/pyspark3d/visualisation.py b/pyspark3d/visualisation.py index 570fb1a..97d4689 100644 --- a/pyspark3d/visualisation.py +++ b/pyspark3d/visualisation.py @@ -1,4 +1,4 @@ -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/runners/README.md b/runners/README.md deleted file mode 100644 index 7713864..0000000 --- a/runners/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Script to launch examples. Copy them at the root of the package (or update paths inside) before launching them. -Likely not up-to-date... diff --git a/runners/benchmark_knn.sh b/runners/benchmark_knn.sh deleted file mode 100755 index c4a5002..0000000 --- a/runners/benchmark_knn.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -#fitsfn="hdfs://134.158.75.222:8020//user/julien.peloton/point_e7.fits" -#hdu=1 -#columns="x,y,z" -#isSpherical=false - -#fitsfn="hdfs://134.158.75.222:8020//lsst/LSST1Y/out_srcs_s1_0.fits" -#fitsfn="hdfs://134.158.75.222:8020//lsst/LSST1Y" -#hdu=1 -#columns="Z_COSMO,RA,Dec" -#isSpherical=true - -nNeighbours=500 - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0" - -# Run it! -spark-submit \ - --master yarn \ - --driver-memory 15g --executor-memory 29g --executor-cores 17 --total-executor-cores 102 \ - --jars ${jars} \ - --class com.spark3d.examples.knnTest \ - --conf "spark.kryoserializer.buffer.max=1024" \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fitsfn $hdu $columns $isSpherical $nNeighbours diff --git a/runners/launch_pyspark.sh b/runners/launch_pyspark.sh deleted file mode 100755 index bb56a40..0000000 --- a/runners/launch_pyspark.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# Run `sbt 'set test in assembly := {}' ++2.11.8 assembly` to get the JAR -JARS=../target/scala-2.11/spark3D-assembly-0.2.2.jar - -# Octree - no part - spark-submit --jars $JARS \ - ../examples/python/collapse_functions.py \ - -inputpath "/Users/julien/Documents/workspace/data/nbody/velocity_field_20_flat.fits" \ - -hdu 1 -part OCTREE -npart 10000 --plot - -exit - -## Other pyspark scripts -- remove the exit above. - -# Onion - no part -spark-submit --jars $JARS \ - ../examples/python/pyspark3d_onion_part.py \ - -inputpath "../src/test/resources/astro_obs.fits" \ - -hdu 1 -npart 10 --plot - -# Onion -spark-submit --jars $JARS \ - ../examples/python/pyspark3d_onion_part.py \ - -inputpath "../src/test/resources/astro_obs.fits" \ - -hdu 1 -part LINEARONIONGRID -npart 10 --plot - -# Octree - no part -spark-submit --jars $JARS \ - ../examples/python/pyspark3d_octree_part.py \ - -inputpath "../src/test/resources/cartesian_spheres.fits" \ - -hdu 1 -npart 10 --plot - -# Octree -spark-submit --jars $JARS \ - ../examples/python/pyspark3d_octree_part.py \ - -inputpath "../src/test/resources/cartesian_spheres.fits" \ - -hdu 1 -part OCTREE -npart 10 --plot diff --git a/runners/run_knn.sh b/runners/run_knn.sh deleted file mode 100755 index 9b3b2a8..0000000 --- a/runners/run_knn.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -fitsfn="src/test/resources/event000001000-hits.csv" -columns="x,y,z" -isSpherical=false - -#fitsfn="hdfs://134.158.75.222:8020//lsst/LSST1Y/out_srcs_s1_0.fits" -#fitsfn="hdfs://134.158.75.222:8020//lsst/LSST1Y" -#hdu=1 -#columns="Z_COSMO,RA,Dec" -#isSpherical=true - -nNeighbours=5000 - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0,com.github.haifengl:smile-core:1.5.1,com.github.haifengl:smile-plot:1.5.1,com.github.haifengl:smile-math:1.5.1,com.github.haifengl:smile-scala_2.11:1.5.1" - -# Run it! -spark-submit \ - --master local[*] \ - --driver-memory 4g --executor-memory 4g \ - --jars ${jars} \ - --class com.spark3d.examples.knnTestPlot \ - --conf "spark.kryoserializer.buffer.max=1024" \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fitsfn $columns $isSpherical $nNeighbours diff --git a/runners/run_knnGeo.sh b/runners/run_knnGeo.sh deleted file mode 100755 index 03b332b..0000000 --- a/runners/run_knnGeo.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -fitsfn="hdfs://134.158.75.222:8020//lsst/LSST1Y/out_srcs_s1_0.fits" -#fitsfn="hdfs://134.158.75.222:8020//user/julien.peloton/sph_point_1000000.fits" -fitsfn="hdfs://134.158.75.222:8020//user/julien.peloton/point_e7.csv" - -nNeighbours=500 - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0,org.datasyslab:geospark:1.1.3" - -# Run it! -spark-submit \ - --master spark://134.158.75.222:7077 \ - --driver-memory 15g --executor-memory 29g --executor-cores 17 --total-executor-cores 102 \ - --jars ${jars} \ - --class com.spark3d.examples.knnTestGeo \ - --conf "spark.kryoserializer.buffer.max=1024" \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fitsfn $nNeighbours diff --git a/runners/run_part.sh b/runners/run_part.sh deleted file mode 100755 index 5fc2128..0000000 --- a/runners/run_part.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -fitsfn="hdfs://134.158.75.222:8020//user/julien.peloton/point_e7.fits" -hdu=1 -columns="x,y,z" -isSpherical=false - -#fitsfn="hdfs://134.158.75.222:8020//lsst/LSST1Y/out_srcs_s1_0.fits" -#fitsfn="hdfs://134.158.75.222:8020//lsst/LSST1Y" -#hdu=1 -#columns="Z_COSMO,RA,Dec" -#isSpherical=true - -mode="onion" - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0" - -# Run it! -spark-submit \ - --master spark://134.158.75.222:7077 \ - --driver-memory 15g --executor-memory 29g --executor-cores 17 --total-executor-cores 153 \ - --jars ${jars} \ - --class com.astrolabsoftware.spark3d.examples.Partitioning \ - --conf "spark.kryoserializer.buffer.max=1024" \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fitsfn $hdu $columns $isSpherical $mode diff --git a/runners/run_scala.sh b/runners/run_scala.sh deleted file mode 100755 index 979c219..0000000 --- a/runners/run_scala.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -fitsfn="file://$PWD/src/test/resources/astro_obs2.fits" -hdu=1 -columns="Z_COSMO,RA,Dec" -display="show" - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0,com.github.haifengl:smile-core:1.5.1,com.github.haifengl:smile-plot:1.5.1,com.github.haifengl:smile-math:1.5.1,com.github.haifengl:smile-scala_2.11:1.5.1" - -# Run it! -spark-submit \ - --master local[*] \ - --class com.astrolabsoftware.spark3d.examples.OnionSpace \ - --jars ${jars} \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fitsfn $hdu $columns $display diff --git a/runners/run_shuffle.sh b/runners/run_shuffle.sh deleted file mode 100755 index 7fa9f04..0000000 --- a/runners/run_shuffle.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -fn="file://$PWD/src/test/resources/sph_point_1000000.fits" - -hdu=1 -columns="Z_COSMO,RA,Dec" -nPart=100 -nside=8192 - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0" - -# Run it! -spark-submit \ - --master local[*] \ - --driver-memory 4g --executor-memory 4g \ - --class com.spark3d.examples.Shuffle \ - --jars ${jars} \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fn $hdu $columns $nPart $nside diff --git a/runners/run_xmatch.sh b/runners/run_xmatch.sh deleted file mode 100755 index 06ea3af..0000000 --- a/runners/run_xmatch.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -fitsfnA="file://$PWD/src/test/resources/sph_point_100000.fits" -fitsfnB="file://$PWD/src/test/resources/sph_point_1000000.fits" - -hdu=1 -columns="Z_COSMO,RA,Dec" -nPart=100 -nside=8192 -kind="healpix" - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0" - -# Run it! -spark-submit \ - --master local[*] \ - --driver-memory 4g --executor-memory 4g \ - --class com.spark3d.examples.CrossMatch \ - --jars ${jars} \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fitsfnA $fitsfnB $hdu $columns $nPart $nside $kind diff --git a/runners/run_xmatch_cluster.sh b/runners/run_xmatch_cluster.sh deleted file mode 100755 index 7869931..0000000 --- a/runners/run_xmatch_cluster.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -fitsfnA="hdfs://134.158.75.222:8020//lsst/LSST1Y/out_srcs_s1_0.fits" -fitsfnB="hdfs://134.158.75.222:8020//lsst/LSST1Y/out_srcs_s1_1.fits" - -hdu=1 -columns="Z_COSMO,RA,Dec" -nPart=100 -nside=512 - -kind="healpix" - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0" - -# Run it! -spark-submit \ - --master spark://134.158.75.222:7077 \ - --driver-memory 4g --executor-memory 30g --executor-cores 17 --total-executor-cores 102 \ - --jars ${jars} \ - --class com.spark3d.examples.CrossMatch \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fitsfnA $fitsfnB $hdu $columns $nPart $nside diff --git a/runners/run_xmatch_geo.sh b/runners/run_xmatch_geo.sh deleted file mode 100755 index eb1ced5..0000000 --- a/runners/run_xmatch_geo.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Copyright 2018 Julien Peloton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## SBT Version -SBT_VERSION=2.11.8 -SBT_VERSION_SPARK=2.11 - -## Package version -VERSION=0.2.2 - -# Package it -sbt ++${SBT_VERSION} package - -# Parameters (put your file) -fitsfnA="file://$PWD/src/test/resources/sph_point_100000nh.csv" -fitsfnB="file://$PWD/src/test/resources/sph_point_100000nh.csv" - -hdu=1 -columns="Z_COSMO,RA,Dec" -nPart=100 - -## Dependencies -jars="lib/jhealpix.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.7.0,org.datasyslab:geospark:1.1.3" - -# Run it! -spark-submit \ - --master local[*] \ - --driver-memory 4g --executor-memory 4g \ - --class com.spark3d.examples.CrossMatchGeo \ - --jars ${jars} \ - --packages ${packages} \ - target/scala-${SBT_VERSION_SPARK}/spark3d_${SBT_VERSION_SPARK}-${VERSION}.jar \ - $fitsfnA $fitsfnB $nPart "join" diff --git a/setup.py b/setup.py index 4c67e84..fb2ce5c 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/Checkers.scala b/src/main/scala/com/spark3d/Checkers.scala index 992d4e7..6d3984e 100644 --- a/src/main/scala/com/spark3d/Checkers.scala +++ b/src/main/scala/com/spark3d/Checkers.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/Partitioners.scala b/src/main/scala/com/spark3d/Partitioners.scala index b2f8f3a..d33ec14 100644 --- a/src/main/scala/com/spark3d/Partitioners.scala +++ b/src/main/scala/com/spark3d/Partitioners.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/Repartitioning.scala b/src/main/scala/com/spark3d/Repartitioning.scala index 7d18605..23e4fc3 100644 --- a/src/main/scala/com/spark3d/Repartitioning.scala +++ b/src/main/scala/com/spark3d/Repartitioning.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/geometryObjects/BoxEnvelope.scala b/src/main/scala/com/spark3d/geometryObjects/BoxEnvelope.scala index c6f420d..3a1c98c 100644 --- a/src/main/scala/com/spark3d/geometryObjects/BoxEnvelope.scala +++ b/src/main/scala/com/spark3d/geometryObjects/BoxEnvelope.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/geometryObjects/Point3D.scala b/src/main/scala/com/spark3d/geometryObjects/Point3D.scala index 76c550b..8c60552 100644 --- a/src/main/scala/com/spark3d/geometryObjects/Point3D.scala +++ b/src/main/scala/com/spark3d/geometryObjects/Point3D.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/geometryObjects/Shape3D.scala b/src/main/scala/com/spark3d/geometryObjects/Shape3D.scala index 78503c1..4973c85 100644 --- a/src/main/scala/com/spark3d/geometryObjects/Shape3D.scala +++ b/src/main/scala/com/spark3d/geometryObjects/Shape3D.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/geometryObjects/ShellEnvelope.scala b/src/main/scala/com/spark3d/geometryObjects/ShellEnvelope.scala index 5b56bee..692b83f 100644 --- a/src/main/scala/com/spark3d/geometryObjects/ShellEnvelope.scala +++ b/src/main/scala/com/spark3d/geometryObjects/ShellEnvelope.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/indexingMethods/HealpixIndexing.scala b/src/main/scala/com/spark3d/indexingMethods/HealpixIndexing.scala index 4dee4d2..5ac4b1a 100644 --- a/src/main/scala/com/spark3d/indexingMethods/HealpixIndexing.scala +++ b/src/main/scala/com/spark3d/indexingMethods/HealpixIndexing.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/package.scala b/src/main/scala/com/spark3d/package.scala index fa93fc4..e18b24e 100644 --- a/src/main/scala/com/spark3d/package.scala +++ b/src/main/scala/com/spark3d/package.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/python/PythonClassTag.scala b/src/main/scala/com/spark3d/python/PythonClassTag.scala index edf3c60..35cd1af 100644 --- a/src/main/scala/com/spark3d/python/PythonClassTag.scala +++ b/src/main/scala/com/spark3d/python/PythonClassTag.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/serialization/Spark3dRegistrator.scala b/src/main/scala/com/spark3d/serialization/Spark3dRegistrator.scala index c539ed9..983291b 100644 --- a/src/main/scala/com/spark3d/serialization/Spark3dRegistrator.scala +++ b/src/main/scala/com/spark3d/serialization/Spark3dRegistrator.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/spatialPartitioning/KeyPartitioner.scala b/src/main/scala/com/spark3d/spatialPartitioning/KeyPartitioner.scala index 03f3d6f..1a8fe11 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/KeyPartitioner.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/KeyPartitioner.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/spatialPartitioning/Octree.scala b/src/main/scala/com/spark3d/spatialPartitioning/Octree.scala index 9f1f80c..d21332e 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/Octree.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/Octree.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioner.scala b/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioner.scala index ec0a5e0..5ace7dd 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioner.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioner.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioning.scala b/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioning.scala index 883ca08..41c62ae 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioning.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioning.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioner.scala b/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioner.scala index cdc6b5d..78645b8 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioner.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioner.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioning.scala b/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioning.scala index e5f4ab2..1802932 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioning.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioning.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/spatialPartitioning/SpatialPartitioner.scala b/src/main/scala/com/spark3d/spatialPartitioning/SpatialPartitioner.scala index 4947fad..4312d47 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/SpatialPartitioner.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/SpatialPartitioner.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/utils/BoundedUniquePriorityQueue.scala b/src/main/scala/com/spark3d/utils/BoundedUniquePriorityQueue.scala index d770306..f915c48 100644 --- a/src/main/scala/com/spark3d/utils/BoundedUniquePriorityQueue.scala +++ b/src/main/scala/com/spark3d/utils/BoundedUniquePriorityQueue.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -86,4 +86,3 @@ class BoundedUniquePriorityQueue[A <: Shape3D](maxSize: Int)(implicit ord: Order } } } - diff --git a/src/main/scala/com/spark3d/utils/ExtPointing.scala b/src/main/scala/com/spark3d/utils/ExtPointing.scala index 05518ac..f8e168f 100644 --- a/src/main/scala/com/spark3d/utils/ExtPointing.scala +++ b/src/main/scala/com/spark3d/utils/ExtPointing.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/utils/GeometryObjectComparator.scala b/src/main/scala/com/spark3d/utils/GeometryObjectComparator.scala index 963b045..97fb4b2 100644 --- a/src/main/scala/com/spark3d/utils/GeometryObjectComparator.scala +++ b/src/main/scala/com/spark3d/utils/GeometryObjectComparator.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/utils/GridType.scala b/src/main/scala/com/spark3d/utils/GridType.scala index 8dd82c2..f8a9e0a 100644 --- a/src/main/scala/com/spark3d/utils/GridType.scala +++ b/src/main/scala/com/spark3d/utils/GridType.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/scala/com/spark3d/utils/Utils.scala b/src/main/scala/com/spark3d/utils/Utils.scala index aa0d9f7..669bafd 100644 --- a/src/main/scala/com/spark3d/utils/Utils.scala +++ b/src/main/scala/com/spark3d/utils/Utils.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/CheckersTest.scala b/src/test/scala/com/spark3d/CheckersTest.scala index 14bcd35..556c91d 100644 --- a/src/test/scala/com/spark3d/CheckersTest.scala +++ b/src/test/scala/com/spark3d/CheckersTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/PartitionersTest.scala b/src/test/scala/com/spark3d/PartitionersTest.scala index c054f01..7e4a3a9 100644 --- a/src/test/scala/com/spark3d/PartitionersTest.scala +++ b/src/test/scala/com/spark3d/PartitionersTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/RepartitioningTest.scala b/src/test/scala/com/spark3d/RepartitioningTest.scala index d4e95cb..37466f0 100644 --- a/src/test/scala/com/spark3d/RepartitioningTest.scala +++ b/src/test/scala/com/spark3d/RepartitioningTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/geometryObjects/BoxEnvelopeTest.scala b/src/test/scala/com/spark3d/geometryObjects/BoxEnvelopeTest.scala index 2a761af..a5e5282 100644 --- a/src/test/scala/com/spark3d/geometryObjects/BoxEnvelopeTest.scala +++ b/src/test/scala/com/spark3d/geometryObjects/BoxEnvelopeTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/geometryObjects/Point3DTest.scala b/src/test/scala/com/spark3d/geometryObjects/Point3DTest.scala index f7f5914..97617a4 100644 --- a/src/test/scala/com/spark3d/geometryObjects/Point3DTest.scala +++ b/src/test/scala/com/spark3d/geometryObjects/Point3DTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/geometryObjects/Shape3DTest.scala b/src/test/scala/com/spark3d/geometryObjects/Shape3DTest.scala index 91dad6a..168f28d 100644 --- a/src/test/scala/com/spark3d/geometryObjects/Shape3DTest.scala +++ b/src/test/scala/com/spark3d/geometryObjects/Shape3DTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/geometryObjects/ShellEnvelopeTest.scala b/src/test/scala/com/spark3d/geometryObjects/ShellEnvelopeTest.scala index fb8c617..a5f7f6a 100644 --- a/src/test/scala/com/spark3d/geometryObjects/ShellEnvelopeTest.scala +++ b/src/test/scala/com/spark3d/geometryObjects/ShellEnvelopeTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/python/PythonClassTagTest.scala b/src/test/scala/com/spark3d/python/PythonClassTagTest.scala index ec07280..985f814 100644 --- a/src/test/scala/com/spark3d/python/PythonClassTagTest.scala +++ b/src/test/scala/com/spark3d/python/PythonClassTagTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/serialization/Spark3dRegistratorTest.scala b/src/test/scala/com/spark3d/serialization/Spark3dRegistratorTest.scala index 9d0447f..50d4298 100644 --- a/src/test/scala/com/spark3d/serialization/Spark3dRegistratorTest.scala +++ b/src/test/scala/com/spark3d/serialization/Spark3dRegistratorTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/spatialPartitioning/KeyPartitionerTest.scala b/src/test/scala/com/spark3d/spatialPartitioning/KeyPartitionerTest.scala index c39370c..73f8e55 100644 --- a/src/test/scala/com/spark3d/spatialPartitioning/KeyPartitionerTest.scala +++ b/src/test/scala/com/spark3d/spatialPartitioning/KeyPartitionerTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/spatialPartitioning/OctreePartitionerTest.scala b/src/test/scala/com/spark3d/spatialPartitioning/OctreePartitionerTest.scala index 2e1fe4e..3ef49d9 100644 --- a/src/test/scala/com/spark3d/spatialPartitioning/OctreePartitionerTest.scala +++ b/src/test/scala/com/spark3d/spatialPartitioning/OctreePartitionerTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/spatialPartitioning/OctreeTest.scala b/src/test/scala/com/spark3d/spatialPartitioning/OctreeTest.scala index d0db2bf..35f06af 100644 --- a/src/test/scala/com/spark3d/spatialPartitioning/OctreeTest.scala +++ b/src/test/scala/com/spark3d/spatialPartitioning/OctreeTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Mayur Bhosale + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/spatialPartitioning/OnionPartitionerTest.scala b/src/test/scala/com/spark3d/spatialPartitioning/OnionPartitionerTest.scala index 54d7157..ff48c8c 100644 --- a/src/test/scala/com/spark3d/spatialPartitioning/OnionPartitionerTest.scala +++ b/src/test/scala/com/spark3d/spatialPartitioning/OnionPartitionerTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/utils/GridTypeTest.scala b/src/test/scala/com/spark3d/utils/GridTypeTest.scala index 11e451b..3e275ef 100644 --- a/src/test/scala/com/spark3d/utils/GridTypeTest.scala +++ b/src/test/scala/com/spark3d/utils/GridTypeTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/com/spark3d/utils/UtilsTest.scala b/src/test/scala/com/spark3d/utils/UtilsTest.scala index 196400c..024d441 100644 --- a/src/test/scala/com/spark3d/utils/UtilsTest.scala +++ b/src/test/scala/com/spark3d/utils/UtilsTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2018 Julien Peloton + * Copyright 2018 AstroLab Software * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test_python.sh b/test_python.sh index caea301..3f9f4cf 100755 --- a/test_python.sh +++ b/test_python.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test_scala.sh b/test_scala.sh index 0da0fba..0dc1212 100755 --- a/test_scala.sh +++ b/test_scala.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Julien Peloton +# Copyright 2018 AstroLab Software # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.