Skip to content

Commit

Permalink
Update for HDBSCAN bug and train_valid_split error
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahshi committed Dec 7, 2023
1 parent eb86a58 commit 9a45980
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ dependencies:
- pip
- pip:
- pyrolite
- PyIRoGlass
- PyIRoGlass
- hdbscan
4 changes: 2 additions & 2 deletions mineralML_colab.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"import pandas as pd\n",
"from sklearn.metrics import classification_report\n",
"\n",
"!pip install torch torchaudio torchvision torchtext\n",
"!pip install -i https://test.pypi.org/simple/ mineralML==0.0.0.0\n",
"!pip install Cython hdbscan\n",
"!pip install -i https://test.pypi.org/simple/ mineralML==0.0.0.4\n",
"import mineralML as mm\n",
"\n",
"from google.colab import files\n",
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@

package_data={
# Include all pickle files
"": ["*.npz", "*.joblib", "*.pt"],
"": ["*.npz", "*.pt"],
},
install_requires=[
'pandas',
'numpy',
'matplotlib',
'scikit-learn',
'scipy',
'torch'
'torch',
'hdbscan'
],

classifiers=[
Expand Down
2 changes: 1 addition & 1 deletion src/mineralML/unsupervised.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import pandas as pd

from sklearn.preprocessing import StandardScaler
from sklearn.model_selection import train_valid_split
from sklearn.model_selection import train_test_split
from sklearn.metrics import classification_report, confusion_matrix
from imblearn.over_sampling import RandomOverSampler

Expand Down

0 comments on commit 9a45980

Please sign in to comment.