From cfed26f5cb82ca83c7a4339623ba561fcc963382 Mon Sep 17 00:00:00 2001 From: Aleksandar Tomasevic Date: Fri, 3 May 2024 13:46:44 +0200 Subject: [PATCH 1/4] Updated library versions in setup_modules function --- R/setup_modules.R | 11 ++++++----- inst/python/video.py | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/R/setup_modules.R b/R/setup_modules.R index 2d425fd..87fec3e 100644 --- a/R/setup_modules.R +++ b/R/setup_modules.R @@ -15,11 +15,12 @@ setup_modules <- function() # Set necessary modules modules <- c( - "accelerate", "llama-index", "nltk", - "opencv-python", "pandas", "pypdf", - "pytube", "pytz", "qdrant-client", - "sentencepiece", "tensorflow", "torch", - "torchaudio", "torchvision", "transformers" + "accelerate==0.29.3", "llama-index==0.10.30", "nltk==3.8.1", + "opencv-python", "pandas==2.1.3", "pypdf==3.17.1", + "pytube==15.0.0", "pytz==2024.1", "qdrant-client==1.8.2", + "sentencepiece==0.2.0", "tensorflow==2.14.1", "torch==2.1.1", + # "torchaudio", "torchvision", + "transformers==4.35.0" ) # Determine whether any modules need to be installed diff --git a/inst/python/video.py b/inst/python/video.py index 18a0a18..666e61f 100644 --- a/inst/python/video.py +++ b/inst/python/video.py @@ -6,12 +6,12 @@ import pandas as pd from pytube import YouTube from transformers import AutoProcessor, AutoModel -import torch -from torch import nn -import torchvision.models as models -from torchvision import transforms +# import torch +# from torch import nn +# import torchvision.models as models +# from torchvision import transforms import torch.nn.functional as F -from PIL import Image +# from PIL import Image import time From 59947b4f976a73104c9651a0258e8a8d38f92602 Mon Sep 17 00:00:00 2001 From: Aleksandar Tomasevic Date: Fri, 3 May 2024 13:52:48 +0200 Subject: [PATCH 2/4] pypdf bumped to 4.0.1 --- R/setup_modules.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/setup_modules.R b/R/setup_modules.R index 87fec3e..826ff18 100644 --- a/R/setup_modules.R +++ b/R/setup_modules.R @@ -16,7 +16,7 @@ setup_modules <- function() # Set necessary modules modules <- c( "accelerate==0.29.3", "llama-index==0.10.30", "nltk==3.8.1", - "opencv-python", "pandas==2.1.3", "pypdf==3.17.1", + "opencv-python", "pandas==2.1.3", "pypdf==4.0.1", "pytube==15.0.0", "pytz==2024.1", "qdrant-client==1.8.2", "sentencepiece==0.2.0", "tensorflow==2.14.1", "torch==2.1.1", # "torchaudio", "torchvision", From 297d2457cfc70f02cde347deeb6d8a2657c36d07 Mon Sep 17 00:00:00 2001 From: Aleksandar Tomasevic Date: Tue, 7 May 2024 15:44:55 +0200 Subject: [PATCH 3/4] gpu module version frozen --- R/setup_gpu_modules.R | 4 +++- R/setup_modules.R | 1 - README.md | 2 +- inst/python/image.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/R/setup_gpu_modules.R b/R/setup_gpu_modules.R index 0f54264..0b24d9b 100644 --- a/R/setup_gpu_modules.R +++ b/R/setup_gpu_modules.R @@ -15,9 +15,11 @@ setup_gpu_modules <- function() # Set necessary modules modules <- c( - "autoawq", "auto-gptq", "optimum" + "autoawq==0.2.5", "auto-gptq==0.7.1", "optimum==1.19.1" ) +# TODO freeze versions of modules to their current versions + # Check for Linux if(system.check()$OS == "linux"){ modules <- c(modules, "llama-cpp-python") diff --git a/R/setup_modules.R b/R/setup_modules.R index 826ff18..e469fea 100644 --- a/R/setup_modules.R +++ b/R/setup_modules.R @@ -19,7 +19,6 @@ setup_modules <- function() "opencv-python", "pandas==2.1.3", "pypdf==4.0.1", "pytube==15.0.0", "pytz==2024.1", "qdrant-client==1.8.2", "sentencepiece==0.2.0", "tensorflow==2.14.1", "torch==2.1.1", - # "torchaudio", "torchvision", "transformers==4.35.0" ) diff --git a/README.md b/README.md index 88b37e6..cbc6fca 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Path can be either local or an URL. Here's an example of using a URL of Mona Lis ```R # Image URL or local filepath -image <- "https://upload.wikimedia.org/wikipedia/commons/thumb/7/76/Leonardo_da_Vinci_-_Mona_Lisa.jpg/401px-Leonardo_da_Vinci_-_Mona_Lisa.jpg" +image <- 'https://cdn.mos.cms.futurecdn.net/xRqbwS4odpkSQscn3jHECh-650-80.jpg' # Array of emotion labels emotions <- c("excitement", "happiness", "pride", "anger", "fear", "sadness", "neutral") diff --git a/inst/python/image.py b/inst/python/image.py index 1e2c563..a5313a1 100644 --- a/inst/python/image.py +++ b/inst/python/image.py @@ -84,7 +84,7 @@ def get_text_embeds(labels): processor_openai model_openai except NameError: - print("Loading OpenAI CLIP model ... \n This may take a minute.") + print("Loading OpenAI CLIP model ...") processor_openai = AutoProcessor.from_pretrained("openai/clip-vit-base-patch32") model_openai = AutoModel.from_pretrained("openai/clip-vit-base-patch32") text_inputs_openai = processor_openai(text=labels, return_tensors='pt', padding=True) From 2276c1f7efe49590fce5d7205eedf3d8735f014e Mon Sep 17 00:00:00 2001 From: Aleksandar Tomasevic Date: Sat, 18 May 2024 19:44:08 +0200 Subject: [PATCH 4/4] devtool checks passed --- man/MASS_mvrnorm.Rd | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/man/MASS_mvrnorm.Rd b/man/MASS_mvrnorm.Rd index c7da501..a239d41 100644 --- a/man/MASS_mvrnorm.Rd +++ b/man/MASS_mvrnorm.Rd @@ -4,14 +4,7 @@ \alias{MASS_mvrnorm} \title{Multivariate Normal (Gaussian) Distribution} \usage{ -MASS_mvrnorm( - n = 1, - mu, - Sigma, - tol = 0.000001, - empirical = FALSE, - EISPACK = FALSE -) +MASS_mvrnorm(n = 1, mu, Sigma, tol = 1e-06, empirical = FALSE, EISPACK = FALSE) } \arguments{ \item{n}{Numeric integer.