Skip to content

Commit

Permalink
[SYSTEMDS-2599] Development branch name change to main
Browse files Browse the repository at this point in the history
  • Loading branch information
j143 committed Nov 1, 2021
1 parent be4f940 commit 596333d
Show file tree
Hide file tree
Showing 22 changed files with 47 additions and 47 deletions.
4 changes: 2 additions & 2 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ github:


protected_branches:
master:
main:
# Do not allow merge commits
# by allowing linear history
required_linear_history: true

staging:
profile: beta
whoami: master
whoami: main
outputdir: docs
4 changes: 2 additions & 2 deletions .github/workflows/applicationTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main
pull_request:
paths-ignore:
- 'docs/**'
Expand All @@ -39,7 +39,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main

jobs:
applicationsTests:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main
pull_request:
paths-ignore:
- 'docs/**'
Expand All @@ -39,7 +39,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/componentTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main
pull_request:
paths-ignore:
- 'docs/**'
Expand All @@ -39,7 +39,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main

jobs:
componentTests:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ on:
- '*.html'
- 'dev/**'
branches:
- master
- main
pull_request:
paths-ignore:
- '*.html'
- 'dev/**'
branches:
- master
- main

jobs:
documentation1:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/functionsTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main
pull_request:
paths-ignore:
- 'docs/**'
Expand All @@ -39,7 +39,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main

jobs:
applicationsTests:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main
pull_request:
paths-ignore:
- 'docs/**'
Expand All @@ -39,7 +39,7 @@ on:
- 'src/main/python/docs/**'
- 'dev/**'
branches:
- master
- main

jobs:
applicationsTests:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ heterogeneous and nested schema.
**Status and Build:** SystemDS is renamed from SystemML which is an **Apache Top Level Project**.
To build from source visit [SystemDS Install from source](https://apache.github.io/systemds/site/install.html)

[![Build](https://github.com/apache/systemds/workflows/Build/badge.svg?branch=master&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Build%22+branch%3Amaster+event%3Apush)
[![Documentation](https://github.com/apache/systemds/workflows/Documentation/badge.svg?branch=master&event=push)](https://github.com/apache/systemds/actions?query=workflow%3ADocumentation+branch%3Amaster+event%3Apush)
[![Component Test](https://github.com/apache/systemds/workflows/Component%20Test/badge.svg?branch=master&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Component+Test%22+branch%3Amaster+event%3Apush)
[![Application Test](https://github.com/apache/systemds/workflows/Application%20Test/badge.svg?branch=master&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Application+Test%22+branch%3Amaster+event%3Apush)
[![Function Test](https://github.com/apache/systemds/workflows/Function%20Test/badge.svg?branch=master&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Function+Test%22+branch%3Amaster+event%3Apush)
[![Python Test](https://github.com/apache/systemds/workflows/Python%20Test/badge.svg?branch=master&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Python+Test%22+branch%3Amaster+event%3Apush)
[![Federated Python Test](https://github.com/apache/systemds/workflows/Federated%20Python%20Test/badge.svg?branch=master&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Federated+Python+Test%22+branch%3Amaster+event%3Apush)
[![Build](https://github.com/apache/systemds/workflows/Build/badge.svg?branch=main&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Build%22+branch%3Amain+event%3Apush)
[![Documentation](https://github.com/apache/systemds/workflows/Documentation/badge.svg?branch=main&event=push)](https://github.com/apache/systemds/actions?query=workflow%3ADocumentation+branch%3Amain+event%3Apush)
[![Component Test](https://github.com/apache/systemds/workflows/Component%20Test/badge.svg?branch=main&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Component+Test%22+branch%3Amain+event%3Apush)
[![Application Test](https://github.com/apache/systemds/workflows/Application%20Test/badge.svg?branch=main&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Application+Test%22+branch%3Amain+event%3Apush)
[![Function Test](https://github.com/apache/systemds/workflows/Function%20Test/badge.svg?branch=main&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Function+Test%22+branch%3Amain+event%3Apush)
[![Python Test](https://github.com/apache/systemds/workflows/Python%20Test/badge.svg?branch=main&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Python+Test%22+branch%3Amain+event%3Apush)
[![Federated Python Test](https://github.com/apache/systemds/workflows/Federated%20Python%20Test/badge.svg?branch=main&event=push)](https://github.com/apache/systemds/actions?query=workflow%3A%22Federated+Python+Test%22+branch%3Amain+event%3Apush)
2 changes: 1 addition & 1 deletion docker/testsysds.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
FROM ubuntu:20.04

# Install Maven
# Credit https://github.com/Zenika/alpine-maven/blob/master/jdk8/Dockerfile
# Credit https://github.com/Zenika/alpine-maven/blob/7623e76e95af5973fe8397a9cabf17c4eb931ec1/jdk8/Dockerfile
# InstallR Guide: https://cran.r-project.org/

WORKDIR /usr/src/
Expand Down
2 changes: 1 addition & 1 deletion docs/_includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<li><a href=".{% if page.path contains 'site' %}/..{% endif %}/site/algorithms-reference.html">ML Algorithms Reference</a></li>
<li class="divider"></li>
<li><b>Other:</b></li>
<li><a href="https://github.com/apache/systemds/blob/master/CONTRIBUTING.md">Contributing to SystemDS 🡕</a></li>
<li><a href="https://github.com/apache/systemds/blob/main/CONTRIBUTING.md">Contributing to SystemDS 🡕</a></li>
</ul>
</li>
<li><a href="https://github.com/apache/systemds">GitHub 🡕</a></li>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/python/sources/guide/federated.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Start Federated worker
To start a federated worker, you first have to setup your environment variables.
A simple guide to do this is in the SystemDS Repository_.

.. _Repository: https://github.com/apache/systemds/tree/master/bin/
.. _Repository: https://github.com/apache/systemds/tree/main/bin/

If that is setup correctly simply start a worker using the following command.
Here the ``8001`` refer to the port used by the worker.
Expand Down
4 changes: 2 additions & 2 deletions docs/css/bootstrap.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ Various forms of documentation for SystemDS are available.
- Instructions on python can be found at [Python Documentation](./api/python/index)
- The [JavaDOC](./api/java/index) contains internal documentation of the system source code.
- [Install from Source](./site/install) guides through setup from git download to running system.
- If you want to contribute take a look at [Contributing](https://github.com/apache/systemds/blob/master/CONTRIBUTING.md)
- If you want to contribute take a look at [Contributing](https://github.com/apache/systemds/blob/main/CONTRIBUTING.md)
- [R to DML](./site/dml-vs-r-guide) walks through the basics of converting a script from R to dml.
4 changes: 2 additions & 2 deletions docs/site/algorithms-factorization-machines.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ criterion is the minimal least square error on $D$.

### Usage

The `train()` function in the [fm-regression.dml](https://github.com/apache/systemml/blob/master/scripts/staging/fm-regression.dml) script, takes in the input variable matrix and the corresponding target vector with some input kept for validation during training.
The `train()` function in the [fm-regression.dml](https://github.com/apache/systemml/blob/main/scripts/staging/fm-regression.dml) script, takes in the input variable matrix and the corresponding target vector with some input kept for validation during training.

``` java
train = function(matrix[double] X, matrix[double] y, matrix[double] X_val, matrix[double] y_val)
Expand Down Expand Up @@ -196,7 +196,7 @@ loss or logit loss.

### Usage

The `train` function in the [fm-binclass.dml](https://github.com/apache/systemml/blob/master/scripts/staging/fm-binclass.dml)
The `train` function in the [fm-binclass.dml](https://github.com/apache/systemml/blob/main/scripts/staging/fm-binclass.dml)
script, takes in the input variable matrix and the corresponding target vector
with some input kept for validation during training. This script also contain
`train()` and `predict()` function as in the case of regression.
4 changes: 2 additions & 2 deletions docs/site/windows-source-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ Ex. Corresponding to the CUDA version, `C:\Program Files\cudnn-9.0-windows10-x64
### Getting Apache SystemDS Source Code

SystemDS source code is available from [github.com/apache/systemds](https://github.com/apache/systemds) by either cloning or
downloading a zip file (based on a branch) into `<SYSTEMDS_HOME>`. The default is the *master* branch.
downloading a zip file (based on a branch) into `<SYSTEMDS_HOME>`. The default is the *main* branch.

```bash
git clone https://github.com/apache/systemds systemds
```

The master branch contains the source code which will be used to create the next major version of Apache SystemDS.
The main branch contains the source code which will be used to create the next major version of Apache SystemDS.

_**Speed Tip:**_ If the complete repository history isn't needed then using a shallow clone (`git clone --depth 1`) will
save significant time.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@
<version>1.6</version>
</dependency>

<!-- https://github.com/protocolbuffers/protobuf/tree/master/java -->
<!-- https://developers.google.com/protocol-buffers/docs/reference/java -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions scripts/staging/google-cloud/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Note: `workerConfig` and `secondaryWorkerConfig` will be present.

### SSH into the cluster

SSH into the cluster (master node) would provide fine grained control of the cluster.
SSH into the cluster (primary node) would provide fine grained control of the cluster.

```sh
gcloud compute ssh ${CLUSTERNAME}-m --zone=us-central1-c
Expand All @@ -109,7 +109,7 @@ For example,
gcloud dataproc clusters list --region=us-central1
```

to exit the cluster master instance
to exit the cluster primary instance

```sh
logout
Expand Down
2 changes: 1 addition & 1 deletion scripts/staging/onnx/onnx_systemds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ limitations under the License.

# onnx-systemds

A tool for importing/exporting [onnx](https://github.com/onnx/onnx/blob/master/docs/IR.md) graphs into/from SystemDS DML scripts.
A tool for importing/exporting [onnx](https://github.com/onnx/onnx/blob/main/docs/IR.md) graphs into/from SystemDS DML scripts.
2 changes: 1 addition & 1 deletion scripts/staging/onnx/onnx_systemds_docs/onnx_systemds.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Prerequisites
to run onnx-systemds you need to:

- install `onnx <https://github.com/onnx/onnx>`_: `Installation instructions <https://github.com/onnx/onnx#installation>`_
- `set up the environment <https://github.com/apache/systemds/blob/master/bin/README.md>`_
- `set up the environment <https://github.com/apache/systemds/blob/main/bin/README.md>`_

Usage
------
Expand Down
18 changes: 9 additions & 9 deletions scripts/staging/onnx/onnx_systemds_docs/onnx_systemds_design.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ Design
This document describes the initial design of `onnx-systemds`

For dealing with different operator-set versions of onnx the current strategy is to use the
`converter provided by onnx <https://github.com/onnx/onnx/blob/master/docs/PythonAPIOverview.md#converting-version-of-an-onnx-model-within-default-domain-aionnx>`_ to convert to a common version.
`converter provided by onnx <https://github.com/onnx/onnx/blob/main/docs/PythonAPIOverview.md#converting-version-of-an-onnx-model-within-default-domain-aionnx>`_ to convert to a common version.

However, the converter does not support adapters for all op-sets/operators so this conversion will fail for many models.
On the onnx repository you can find a list of
`currently supported adapters <https://github.com/onnx/onnx/blob/master/onnx/version_converter.py#L21>`_
`currently supported adapters <https://github.com/onnx/onnx/blob/main/onnx/version_converter.py#L21>`_


Goals
-----

- Support for importing `operators of the ONNX base definition <https://github.com/onnx/onnx/blob/master/docs/Operators.md>`_
- Support for importing `operators defined by ONNX-ML <https://github.com/onnx/onnx/blob/master/docs/Operators-ml.md>`_
- Support for importing `operators of the ONNX base definition <https://github.com/onnx/onnx/blob/main/docs/Operators.md>`_
- Support for importing `operators defined by ONNX-ML <https://github.com/onnx/onnx/blob/main/docs/Operators-ml.md>`_
- Support for exporting DML script to ONNX graphs


Expand All @@ -50,19 +50,19 @@ Onnx - Operators

Onnx includes several very simple and also more complex operators.
When implementing an operator it's best to have a look at the
`operator schemas <https://github.com/onnx/onnx/blob/master/docs/Operators.md>`_,
`operator schemas <https://github.com/onnx/onnx/blob/main/docs/Operators.md>`_,
which precisely define the inputs, outputs and attributes of the operation.

Besides the standard onnx definition, there also exists onnx-ML the operator schemas for which are defined in a
`separate document <https://github.com/onnx/onnx/blob/master/docs/Operators-ml.md>`_.
`separate document <https://github.com/onnx/onnx/blob/main/docs/Operators-ml.md>`_.
It is an extension of the standard onnx format, however currently only onnx standard operators are supported.

Onnx - Files
-------------

Onnx uses the `ProtoBuf format <https://developers.google.com/protocol-buffers/>`_.
It specifies this representation in several ``.proto``/``.proto3``
`files <https://github.com/onnx/onnx/tree/master/onnx>`_ again with dedicated files for onnx-ML.
`files <https://github.com/onnx/onnx/tree/main/onnx>`_ again with dedicated files for onnx-ML.
These files are helpful to understand the underlying structure and values that are possible.

Protobuf creates the underlying structure such that you can access elements of the onnx graph as if they were
Expand Down Expand Up @@ -167,7 +167,7 @@ Implementing new operators
----------------------------

When implementing an operator it's best to have a look at the
`operator schemas <https://github.com/onnx/onnx/blob/master/docs/Operators.md>`_
`operator schemas <https://github.com/onnx/onnx/blob/main/docs/Operators.md>`_
which exactly define the inputs, outputs and attributes of the operation

It is also nice to have a test-model to work with, to generate one refer to
Expand All @@ -184,7 +184,7 @@ Testing models
---------------

onnx provides a convenient way for
`creating models <https://github.com/onnx/onnx/blob/master/docs/PythonAPIOverview.md#checking-an-onnx-model>`_
`creating models <https://github.com/onnx/onnx/blob/main/docs/PythonAPIOverview.md#checking-an-onnx-model>`_
using helper functions in python. All current test-models are produced like this (see ``tests/onnx/test_models``).

Creating a Testcase
Expand Down
2 changes: 1 addition & 1 deletion src/assembly/bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.

SystemDS is a versatile system for the end-to-end data science lifecycle from data integration, cleaning, and feature engineering, over efficient, local and distributed ML model training, to deployment and serving. To this end, we aim to provide a stack of declarative languages with R-like syntax for (1) the different tasks of the data-science lifecycle, and (2) users with different expertise. These high-level scripts are compiled into hybrid execution plans of local, in-memory CPU and GPU operations, as well as distributed operations on Apache Spark. In contrast to existing systems - that either provide homogeneous tensors or 2D Datasets - and in order to serve the entire data science lifecycle, the underlying data model are DataTensors, i.e., tensors (multi-dimensional arrays) whose first dimension may have a heterogeneous and nested schema.

**Documentation:** [SystemDS Documentation](https://github.com/apache/systemds/tree/master/docs)
**Documentation:** [SystemDS Documentation](https://github.com/apache/systemds/tree/main/docs)

## Getting started

Expand Down
2 changes: 1 addition & 1 deletion src/main/python/docs/source/guide/federated.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Start Federated worker
To start a federated worker, you first have to setup your environment variables.
A simple guide to do this is in the SystemDS Repository_.

.. _Repository: https://github.com/apache/systemds/tree/master/bin/
.. _Repository: https://github.com/apache/systemds/tree/main/bin/

If that is setup correctly simply start a worker using the following command.
Here the ``8001`` refer to the port used by the worker.
Expand Down

0 comments on commit 596333d

Please sign in to comment.