This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/main by this push:
new 5a9e2fb193 [MINOR] Fix missing licenses and remove wildcard imports
5a9e2fb193 is described below
commit 5a9e2fb1937075082841c4198702bd6a8af0d962
Author: Matthias Boehm <[email protected]>
AuthorDate: Sun Nov 17 13:10:40 2024 +0100
[MINOR] Fix missing licenses and remove wildcard imports
---
scripts/resource/README.md | 21 +++++++++++++++-
scripts/resource/bin/systemds-ropt | 20 +++++++++++++++
scripts/resource/requirements.txt | 21 ++++++++++++++++
scripts/resource/update_prices.py | 23 ++++++++++++++++-
.../apache/sysds/resource/ResourceOptimizer.java | 29 +++++++++++++++++++++-
.../component/resource/ResourceOptimizerTest.java | 25 ++++++++++++++++++-
6 files changed, 135 insertions(+), 4 deletions(-)
diff --git a/scripts/resource/README.md b/scripts/resource/README.md
index dadcfae77b..47371f064c 100644
--- a/scripts/resource/README.md
+++ b/scripts/resource/README.md
@@ -1,3 +1,22 @@
+<!--
+{% comment %}
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you 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.
+{% end comment %}
+-->
+
# Resource Optimizer
The **Resource Optimizer** is an extension that allows for automatic
generation of (near) optimal cluster configurations for
executing a given SystemDS script in a cloud environment - currently only AWS.
@@ -166,4 +185,4 @@ if `AUTO_TERMINATION_TIME` is set to 0 the cluster will be
automatically termina
The provided URI addresses for S3 files should always use the `s3://` prefix
to allow for the proper functionality
of the EMR-specific S3 connector.
-*The same notes as for the launch on programs as EC2 are valid here as well!*
\ No newline at end of file
+*The same notes as for the launch on programs as EC2 are valid here as well!*
diff --git a/scripts/resource/bin/systemds-ropt
b/scripts/resource/bin/systemds-ropt
index 1318c26472..65d4a4fbc2 100755
--- a/scripts/resource/bin/systemds-ropt
+++ b/scripts/resource/bin/systemds-ropt
@@ -1,4 +1,24 @@
#!/usr/bin/env bash
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+#-------------------------------------------------------------
ROPT_JAR_FILE="${SYSTEMDS_ROOT}/target/ResourceOptimizer.jar"
DEFAULT_PROPERTIES="${SYSTEMDS_ROOT}/scripts/resource/options.properties"
diff --git a/scripts/resource/requirements.txt
b/scripts/resource/requirements.txt
index b650973470..2ef8995ac0 100644
--- a/scripts/resource/requirements.txt
+++ b/scripts/resource/requirements.txt
@@ -1,2 +1,23 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+#-------------------------------------------------------------
+
pandas
boto3
diff --git a/scripts/resource/update_prices.py
b/scripts/resource/update_prices.py
index a633c34b27..28c7e360c2 100644
--- a/scripts/resource/update_prices.py
+++ b/scripts/resource/update_prices.py
@@ -1,3 +1,24 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+#-------------------------------------------------------------
+
import argparse
import csv
import json
@@ -78,4 +99,4 @@ def main():
update_prices(args.region, args.table_file)
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/src/main/java/org/apache/sysds/resource/ResourceOptimizer.java
b/src/main/java/org/apache/sysds/resource/ResourceOptimizer.java
index 8a2427561a..ad75de8abc 100644
--- a/src/main/java/org/apache/sysds/resource/ResourceOptimizer.java
+++ b/src/main/java/org/apache/sysds/resource/ResourceOptimizer.java
@@ -1,6 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
package org.apache.sysds.resource;
-import org.apache.commons.cli.*;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.OptionGroup;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.sysds.conf.CompilerConfig;
diff --git
a/src/test/java/org/apache/sysds/test/component/resource/ResourceOptimizerTest.java
b/src/test/java/org/apache/sysds/test/component/resource/ResourceOptimizerTest.java
index 6f9ac86513..0bcde088d7 100644
---
a/src/test/java/org/apache/sysds/test/component/resource/ResourceOptimizerTest.java
+++
b/src/test/java/org/apache/sysds/test/component/resource/ResourceOptimizerTest.java
@@ -1,6 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
package org.apache.sysds.test.component.resource;
-import org.apache.commons.cli.*;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.sysds.resource.CloudInstance;
import org.apache.sysds.resource.ResourceOptimizer;
