Merge pull request #25 from clearmatics/develop

v0.1.0 - Andromeda

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
               with:
                   java-version: '11'
             - name: Run tests with Maven
-              run: mvn clean test
+              run: DIZK=`pwd` mvn clean test
 
     check-fmt:
         runs-on: ubuntu-20.04

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "depends/spark-ec2"]
-	path = depends/spark-ec2
-	url = https://github.com/amplab/spark-ec2.git
-	branch = branch-2.0

LICENSE

@@ -1,6 +1,7 @@
 The DIZK library is developed by SCIPR Lab (http://scipr-lab.org)
 and contributors.
 
+Copyright (c) 2020-2021 Clearmatics
 Copyright (c) 2018 SCIPR Lab and contributors (see AUTHORS file).
 
 All files, with the exceptions below, are released under the MIT License:
@@ -21,4 +22,4 @@ All files, with the exceptions below, are released under the MIT License:
   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE.

pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <!-- See https://maven.apache.org/pom.html#pom-reference -->
-    <groupId>dizk</groupId>
-    <artifactId>dizk</artifactId>
+    <groupId>neodizk</groupId>
+    <artifactId>neodizk</artifactId>
     <version>0.1.0</version>
     <packaging>jar</packaging>
 
@@ -53,6 +53,11 @@
             <artifactId>versions-maven-plugin</artifactId>
             <version>2.8.1</version>
         </dependency>
+        <dependency>
+          <groupId>com.googlecode.json-simple</groupId>
+          <artifactId>json-simple</artifactId>
+          <version>1.1.1</version>
+        </dependency>
     </dependencies>
 
     <build>

scripts/ganglia_setup_master.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+# Expect 1 non-empty argument
+if [ "$#" -ne 1 ] || [ "$1" == "" ] ; then
+    echo "Error: invalid number of arguments"
+    echo "Usage: $0 <cluster-name>"
+    echo ""
+    exit 1
+fi
+
+CLUSTER_NAME=$1
+
+# Install ganglia dependencies
+echo "INFO: install ganglia dependencies"
+yum update -y
+amazon-linux-extras install -y epel
+yum install -y ganglia rrdtool ganglia-gmetad ganglia-gmond ganglia-web
+
+echo "INFO: edit /etc/ganglia/gmetad.conf"
+# Keep the default port (8649) and default polling interval (15s)
+sed -i "s/my cluster/$CLUSTER_NAME/g" /etc/ganglia/gmetad.conf
+
+echo "INFO: edit /etc/ganglia/gmond.conf"
+sed -i 's/  name = "unspecified"/  name = '\"$CLUSTER_NAME\"'/g' /etc/ganglia/gmond.conf
+# Ports in gmond are already set by default so no need to change
+sed -i  "0,/  mcast_join = /! {0,/  mcast_join = / s/  mcast_join =/  #mcast_join = /}" /etc/ganglia/gmond.conf
+sed -i "s/  mcast_join = .*/  host = localhost/g" /etc/ganglia/gmond.conf
+sed -i "s/  bind = /  #bind = /g" /etc/ganglia/gmond.conf
+sed -i "s/  retry_bind = /  #retry_bind = /g" /etc/ganglia/gmond.conf
+
+# Restart the services after editing the config files
+echo "INFO: restarting the services"
+service httpd restart
+service gmond restart
+service gmetad restart
+
+# Edit the default config `/etc/httpd/conf.d/ganglia.conf`
+echo "INFO: make sure to correctly configure the webserver (then restart the httpd service)"
+# E.g. set up some auth to access the ganglia dashboard
+# $ htpasswd -c /etc/httpd/auth.basic adminganglia
+# $ vi /etc/httpd/conf.d/ganglia.conf
+## Alias /ganglia /usr/share/ganglia
+## <Location /ganglia>
+##     AuthType basic
+##     AuthName "Ganglia web UI"
+##     AuthBasicProvider file
+##     AuthUserFile "/etc/httpd/auth.basic"
+##     Require user adminganglia
+## </Location>
+
+echo "INFO: make sure to correctly configure the AWS security-group to be able to access the ganglia dashboard"

scripts/ganglia_setup_worker.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# Expect 2 non-empty arguments
+if [ "$#" -ne 2 ] || [ "$1" == "" ] || [ "$2" == "" ] ; then
+    echo "Error: invalid number of arguments"
+    echo "Usage: $0 <cluster-name> <gmetad-host>"
+    echo ""
+    exit 1
+fi
+
+CLUSTER_NAME=$1
+GMETAD_HOST=$2
+
+# Install ganglia dependencies
+echo "INFO: install ganglia dependencies"
+yum update -y
+amazon-linux-extras install -y epel
+yum install -y ganglia ganglia-gmond
+
+echo "INFO: edit gmond.conf"
+sed -i 's/  name = "unspecified"/  name = '\"$CLUSTER_NAME\"'/g' /etc/ganglia/gmond.conf
+sed -i "0,/  mcast_join = /! {0,/  mcast_join = / s/  mcast_join = /#mcast_join = /}" /etc/ganglia/gmond.conf
+sed -i "s/  mcast_join = .*/  host = $GMETAD_HOST/g" /etc/ganglia/gmond.conf
+sed -i "s/  bind = /  #bind = /g" /etc/ganglia/gmond.conf
+sed -i "s/  retry_bind = /  #retry_bind = /g" /etc/ganglia/gmond.conf
+
+echo "INFO: restarting the services"
+service gmond restart

setup_env

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+export DIZK=`pwd`

src/main/java/algebra/curves/README.md

@@ -0,0 +1,6 @@
+# algebra.curves
+
+The set of points on an elliptic curve along with the usual addition rule ("chord and tangent") define a algebraic group.
+As such, implementing a curve family (and/or a unique curve in a family) can be done by following the process described in [algebra.groups](../groups/README.md).
+However, a few extra functions are added in the `AbstractG1`, `AbstractG2` etc. files that extend `AbstractGroup` to provide useful functions w.r.t elliptic curves.
+As such, these classes are those that need to be inherited and instantiated when implementing a "concrete" elliptic curve.