Skip to content

Commit 5a9e2fb

Browse files
committed
[MINOR] Fix missing licenses and remove wildcard imports
1 parent 1d1b008 commit 5a9e2fb

File tree

6 files changed

+135
-4
lines changed

6 files changed

+135
-4
lines changed

scripts/resource/README.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
{% comment %}
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to you under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
{% end comment %}
18+
-->
19+
120
# Resource Optimizer
221
The **Resource Optimizer** is an extension that allows for automatic generation of (near) optimal cluster configurations for
322
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
166185
The provided URI addresses for S3 files should always use the `s3://` prefix to allow for the proper functionality
167186
of the EMR-specific S3 connector.
168187

169-
*The same notes as for the launch on programs as EC2 are valid here as well!*
188+
*The same notes as for the launch on programs as EC2 are valid here as well!*

scripts/resource/bin/systemds-ropt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
#!/usr/bin/env bash
2+
#-------------------------------------------------------------
3+
#
4+
# Licensed to the Apache Software Foundation (ASF) under one
5+
# or more contributor license agreements. See the NOTICE file
6+
# distributed with this work for additional information
7+
# regarding copyright ownership. The ASF licenses this file
8+
# to you under the Apache License, Version 2.0 (the
9+
# "License"); you may not use this file except in compliance
10+
# with the License. You may obtain a copy of the License at
11+
#
12+
# http://www.apache.org/licenses/LICENSE-2.0
13+
#
14+
# Unless required by applicable law or agreed to in writing,
15+
# software distributed under the License is distributed on an
16+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
# KIND, either express or implied. See the License for the
18+
# specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
#-------------------------------------------------------------
222

323
ROPT_JAR_FILE="${SYSTEMDS_ROOT}/target/ResourceOptimizer.jar"
424
DEFAULT_PROPERTIES="${SYSTEMDS_ROOT}/scripts/resource/options.properties"

scripts/resource/requirements.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,23 @@
1+
#-------------------------------------------------------------
2+
#
3+
# Licensed to the Apache Software Foundation (ASF) under one
4+
# or more contributor license agreements. See the NOTICE file
5+
# distributed with this work for additional information
6+
# regarding copyright ownership. The ASF licenses this file
7+
# to you under the Apache License, Version 2.0 (the
8+
# "License"); you may not use this file except in compliance
9+
# with the License. You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing,
14+
# software distributed under the License is distributed on an
15+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
# KIND, either express or implied. See the License for the
17+
# specific language governing permissions and limitations
18+
# under the License.
19+
#
20+
#-------------------------------------------------------------
21+
122
pandas
223
boto3

scripts/resource/update_prices.py

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
#-------------------------------------------------------------
2+
#
3+
# Licensed to the Apache Software Foundation (ASF) under one
4+
# or more contributor license agreements. See the NOTICE file
5+
# distributed with this work for additional information
6+
# regarding copyright ownership. The ASF licenses this file
7+
# to you under the Apache License, Version 2.0 (the
8+
# "License"); you may not use this file except in compliance
9+
# with the License. You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing,
14+
# software distributed under the License is distributed on an
15+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
# KIND, either express or implied. See the License for the
17+
# specific language governing permissions and limitations
18+
# under the License.
19+
#
20+
#-------------------------------------------------------------
21+
122
import argparse
223
import csv
324
import json
@@ -78,4 +99,4 @@ def main():
7899
update_prices(args.region, args.table_file)
79100

80101
if __name__ == "__main__":
81-
main()
102+
main()

src/main/java/org/apache/sysds/resource/ResourceOptimizer.java

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
120
package org.apache.sysds.resource;
221

3-
import org.apache.commons.cli.*;
22+
import org.apache.commons.cli.CommandLine;
23+
import org.apache.commons.cli.CommandLineParser;
24+
import org.apache.commons.cli.HelpFormatter;
25+
import org.apache.commons.cli.Option;
26+
import org.apache.commons.cli.OptionBuilder;
27+
import org.apache.commons.cli.OptionGroup;
28+
import org.apache.commons.cli.Options;
29+
import org.apache.commons.cli.ParseException;
30+
import org.apache.commons.cli.PosixParser;
431
import org.apache.commons.configuration2.PropertiesConfiguration;
532
import org.apache.commons.configuration2.ex.ConfigurationException;
633
import org.apache.sysds.conf.CompilerConfig;

src/test/java/org/apache/sysds/test/component/resource/ResourceOptimizerTest.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
120
package org.apache.sysds.test.component.resource;
221

3-
import org.apache.commons.cli.*;
22+
import org.apache.commons.cli.CommandLine;
23+
import org.apache.commons.cli.CommandLineParser;
24+
import org.apache.commons.cli.Options;
25+
import org.apache.commons.cli.ParseException;
26+
import org.apache.commons.cli.PosixParser;
427
import org.apache.commons.configuration2.PropertiesConfiguration;
528
import org.apache.sysds.resource.CloudInstance;
629
import org.apache.sysds.resource.ResourceOptimizer;

0 commit comments

Comments
 (0)