Merge pull request #9 from adrianoesch/fix-version-conflicts

Fix version conflicts
andreeaiana · Mar 18, 2024 · 3fce487 · 3fce487
2 parents 2ae8f44 + 36bd49d
commit 3fce487
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -152,3 +152,6 @@ configs/local/default.yaml
 
 # Aim logging
 .aim
+
+outputs
+.DS_Store
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ If you want to use NewsRecLib with GPU, please ensure CUDA or cudatoolkit versio
 ```bash
    git clone https://github.com/andreeaiana/newsreclib.git
    cd newsreclib
-   conda create --name newsreclib_env python=3.8
+   conda create --name newsreclib_env python=3.9
    conda activate newsreclib_env
    pip install -e .
 ```

diff --git a/setup.py b/setup.py
@@ -11,8 +11,9 @@
     url="https://github.com/andreeaiana/newsreclib",
     install_requires=[
         "colorcet==3.0.1",
+        "cmake==3.18.4",
         "hydra-core==1.3.2",
-        "lightning==2.0.4",
+        "lightning==2.2.1",
         "MulticoreTSNE==0.1",
         "numpy==1.25.0",
         "omegaconf==2.3.0",
@@ -28,10 +29,10 @@
         "scikit-learn==1.2.2",
         "seaborn==0.12.2",
         "sphinx==5.0.2",
-        "tokenizers==0.13.2",
+        "tokenizers==0.15.2",
         "torchmetrics==1.3.1",
         "tqdm==4.65.0",
-        "transformers==4.36.0",
+        "transformers==4.38.2",
         "wandb==0.15.3",
         "hydra-colorlog==1.2.0",
         "hydra-optuna-sweeper==1.2.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,3 +152,6 @@ configs/local/default.yaml @@
     # Aim logging
     .aim
+    outputs
+    .DS_Store