From d5d41f4ce96242e8b0546a60480bfa81dc8ff4bf Mon Sep 17 00:00:00 2001 From: Henry Webel Date: Fri, 7 Jun 2024 10:46:55 +0200 Subject: [PATCH 1/3] :bug: try to fix error in zsh on M1 "zsh: illegal hardware instruction python" could be worked around using direct imports in another case --- mrmr/__init__.py | 12 ++++++------ mrmr/bigquery.py | 2 +- mrmr/pandas.py | 2 +- mrmr/polars.py | 2 +- mrmr/spark.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mrmr/__init__.py b/mrmr/__init__.py index a21600e..d637cb4 100644 --- a/mrmr/__init__.py +++ b/mrmr/__init__.py @@ -1,8 +1,8 @@ -from . import bigquery -from . import pandas -from . import polars -from . import spark -from .pandas import mrmr_classif, mrmr_regression -from .main import mrmr_base +from mrmr import bigquery +from mrmr import pandas +from mrmr import polars +from mrmr import spark +from mrmr.pandas import mrmr_classif, mrmr_regression +from mrmr.main import mrmr_base __version__ = "0.2.8" \ No newline at end of file diff --git a/mrmr/bigquery.py b/mrmr/bigquery.py index 1c6bb0e..226e135 100644 --- a/mrmr/bigquery.py +++ b/mrmr/bigquery.py @@ -1,6 +1,6 @@ import jinja2 import numpy as np -from .main import mrmr_base, groupstats2fstat +from mrmr.main import mrmr_base, groupstats2fstat def get_numeric_features(bq_client, table_id, target_column): diff --git a/mrmr/pandas.py b/mrmr/pandas.py index 7a73762..f71226a 100644 --- a/mrmr/pandas.py +++ b/mrmr/pandas.py @@ -8,7 +8,7 @@ from sklearn.feature_selection import f_regression as sklearn_f_regression from scipy.stats import ks_2samp from sklearn.ensemble import RandomForestClassifier, RandomForestRegressor -from .main import mrmr_base +from mrmr.main import mrmr_base def parallel_df(func, df, series, n_jobs): diff --git a/mrmr/polars.py b/mrmr/polars.py index d2ae04a..d5713ad 100644 --- a/mrmr/polars.py +++ b/mrmr/polars.py @@ -1,7 +1,7 @@ import numpy as np import pandas as pd import polars as pl -from .main import groupstats2fstat, mrmr_base +from mrmr.main import groupstats2fstat, mrmr_base def get_numeric_features(df, target_column): diff --git a/mrmr/spark.py b/mrmr/spark.py index cc538c1..a18d49b 100644 --- a/mrmr/spark.py +++ b/mrmr/spark.py @@ -1,6 +1,6 @@ import numpy as np import pandas as pd -from .main import groupstats2fstat, mrmr_base +from mrmr.main import groupstats2fstat, mrmr_base def get_numeric_features(df, target_column): From c04423106a337ec3129a45183b60c991cf6196ab Mon Sep 17 00:00:00 2001 From: Henry Webel Date: Fri, 7 Jun 2024 14:41:04 +0200 Subject: [PATCH 2/3] :art: make it installable from github --- mrmr/__init__.py | 4 +++- setup.py | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mrmr/__init__.py b/mrmr/__init__.py index d637cb4..9a19965 100644 --- a/mrmr/__init__.py +++ b/mrmr/__init__.py @@ -1,3 +1,5 @@ +from importlib.metadata import version + from mrmr import bigquery from mrmr import pandas from mrmr import polars @@ -5,4 +7,4 @@ from mrmr.pandas import mrmr_classif, mrmr_regression from mrmr.main import mrmr_base -__version__ = "0.2.8" \ No newline at end of file +_version__ = version('mrmr_selection') \ No newline at end of file diff --git a/setup.py b/setup.py index f2f4bed..d90f72d 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,11 @@ from setuptools import setup -from mrmr import __version__ with open("README.md", encoding="utf8") as f: long_description = f.read() setup( name='mrmr_selection', - version=__version__, + version='0.2.9', description='minimum-Redundancy-Maximum-Relevance algorithm for feature selection', long_description=long_description, long_description_content_type='text/markdown', From a1a0475ade2b82674caabeb2edc4871f28787fff Mon Sep 17 00:00:00 2001 From: Henry Webel Date: Fri, 7 Jun 2024 15:26:15 +0200 Subject: [PATCH 3/3] :bug: workaround for polar on M1 - only load polar if requested explicitly - not needed for main function see: https://github.com/pola-rs/polars/issues/11650 (polars on M1 needs correct compiled binaries) --- mrmr/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mrmr/__init__.py b/mrmr/__init__.py index 9a19965..168f3bc 100644 --- a/mrmr/__init__.py +++ b/mrmr/__init__.py @@ -2,7 +2,8 @@ from mrmr import bigquery from mrmr import pandas -from mrmr import polars +# trigger: zsh: illegal hardware instructions if used with wrong package +# from mrmr import polars from mrmr import spark from mrmr.pandas import mrmr_classif, mrmr_regression from mrmr.main import mrmr_base