Skip to content

Fix typos, add venv to .gitignore #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kinow wants to merge 3 commits into
base: stable
Choose a base branch
from
Open

Fix typos, add venv to .gitignore #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03cfc07
Ignore venv directories
kinow Jul 5, 2022
6fb3ce7
Use platform module for system/OS, use f-strings too
kinow Jul 5, 2022
12162c2
Fix typos
kinow Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ target/
# Jupyter Notebook
.ipynb_checkpoints

# virtualenv
venv/


# ========== C & C++ ignores =================

Expand Down
4 changes: 2 additions & 2 deletions compss/programming_model/bindings/python/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ get_args() {
unittests=false
;;
*)
# Flag didn't match any patern. End of COMPSs' Python Binding flags
# Flag didn't match any pattern. End of COMPSs' Python Binding flags
display_error "${INCORRECT_PARAMETER}"
break
;;
esac
;;
*)
# Flag didn't match any patern. End of COMPSs flags
# Flag didn't match any pattern. End of COMPSs flags
display_error "${INCORRECT_PARAMETER}"
break
;;
Expand Down
6 changes: 3 additions & 3 deletions compss/programming_model/bindings/python/scripts/compilation/metrics.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# shellcheck disable=SC2164
cd "${SCRIPT_DIR}/../../src/"

##########################################
## Check typing (with metics) with mypy ##
##########################################
###########################################
## Check typing (with metrics) with mypy ##
###########################################

mypy --pretty --html-report . --txt-report . --check-untyped-defs --warn-redundant-casts --ignore-missing-imports --exclude 'pycompss\/((tests\/)|(dds\/)|(streams\/)||(interactive.py)|(__main__.py))$' ./pycompss/
ev=$?
Expand Down
4 changes: 2 additions & 2 deletions compss/programming_model/bindings/python/scripts/test/unittests_commons.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,14 @@ get_args() {
jupyter_unittests=false
;;
*)
# Flag didn't match any patern. End of Unittests flags
# Flag didn't match any pattern. End of Unittests flags
display_error "${INCORRECT_PARAMETER}"
break
;;
esac
;;
*)
# Flag didn't match any patern. End of COMPSs flags
# Flag didn't match any pattern. End of COMPSs flags
display_error "${INCORRECT_PARAMETER}"
break
;;
Expand Down
3 changes: 2 additions & 1 deletion compss/programming_model/bindings/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import re
import sys
import pathlib
import platform
from setuptools import setup, Extension

GCC_DEBUG_FLAGS = [
Expand All @@ -49,7 +50,7 @@
"-fstack-protector",
]

TARGET_OS = os.environ["TARGET_OS"]
TARGET_OS = platform.system()
Copy link
Author

@kinow kinow Jul 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure if there was a reason for using this environment variable, but if it's legacy code, then maybe the platform module is a more suitable option? The TARGET_OS is not defined in my env.

if TARGET_OS == "Linux":
INCLUDE_JDK = os.path.join(os.environ["JAVA_HOME"], "include", "linux")
OS_EXTRA_COMPILE_COMPSS = ["-fPIC", "-std=c++11"]
Expand Down
4 changes: 2 additions & 2 deletions compss/programming_model/bindings/python/src/pycompss/functions/elapsed_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None:
def __call__(self, function: typing.Any) -> typing.Any:
"""Elapsed time decorator.

:param f: Function to be time measured (can be a decorated function,
usually with @task decorator).
:param function: Function to be time measured (can be a decorated
function, usually with @task decorator).
:return: the decorator wrapper.
"""

Expand Down
7 changes: 2 additions & 5 deletions compss/programming_model/bindings/python/src/pycompss/runtime/task/master.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
from pycompss.util.objects.properties import is_dict
from pycompss.util.objects.sizer import total_sizeof
from pycompss.util.serialization import serializer
from pycompss.util.serialization.serializer import serialize_to_bytes
from pycompss.util.serialization.serializer import serialize_to_file
from pycompss.util.storages.persistent import get_id
from pycompss.util.tracing.helpers import emit_manual_event_explicit
Expand All @@ -97,8 +96,6 @@
logger = logging.getLogger(__name__)

# Types conversion dictionary from python to COMPSs
_PYTHON_TO_COMPSS = {} # type: dict

_PYTHON_TO_COMPSS = {
int: TYPE.INT, # int # long
float: TYPE.DOUBLE, # float
Expand Down Expand Up @@ -873,7 +870,7 @@ def build_parameter_object(
param = self.decorator_arguments.get(arg_name, default_parameter)

# If the parameter is a FILE then its type will already be defined,
# and get_compss_type will misslabel it as a parameter.TYPE.STRING
# and get_compss_type will mislabel it as a parameter.TYPE.STRING
if param.is_object():
param.content_type = get_compss_type(arg_object, code_strings=code_strings)

Expand Down Expand Up @@ -2194,7 +2191,7 @@ def _turn_into_file(param: Parameter, name: str, skip_creation: bool = False) ->
registered in the obj_id_to_filename dictionary.
This functions stores the object into pending_to_synchronize.

:param p: Wrapper of the object to turn into file.
:param param: Wrapper of the object to turn into file.
:param name: Name of the object.
:param skip_creation: Skips the serialization to file.
:return: None.
Expand Down
6 changes: 3 additions & 3 deletions compss/programming_model/bindings/python/src/pycompss/util/typing_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ def wrapped_mypyc_attr(*args: typing.Any, **kwargs: typing.Any) -> typing.Any:
mypyc_attr = DummyMypycAttr # pylint: disable=invalid-name


######################################
# Boilerplate to mimic user fuctions #
######################################
#######################################
# Boilerplate to mimic user functions #
#######################################


def dummy_function() -> None:
Expand Down