moving to test data from OSF and setting weights_only=False

Author: carsen-stringer

README.md

@@ -105,7 +105,7 @@ For any issues or questions about Facemap, please [open an issue](https://github
 The models will be downloaded automatically from our website when you first run Facemap for processing keypoints. If download of pretrained models fails, please try the following:
 
 - to resolve certificate error try: ```pip install –upgrade certifi```, or
-- download the pretrained model files: [model state](https://www.facemappy.org/models/facemap_model_state.pt) and [model parameters](https://www.facemappy.org/models/facemap_model_params.pth) and place them in the `models` subfolder of the hidden `facemap` folder located in home directory. Path to the hidden folder is: `C:\Users\your_username\.facemap\models` on Windows and `/home/your_username/.facemap/models` on Linux and Mac. 
+- download the pretrained model files: [model_params](https://osf.io/download/67f00beaba4331d9888b7f36/), [model_state](https://osf.io/download/67f00be8959068ade6cf70f1/)  and place them in the `models` subfolder of the hidden `facemap` folder located in home directory. Path to the hidden folder is: `C:\Users\your_username\.facemap\models` on Windows and `/home/your_username/.facemap/models` on Linux and Mac. 
 
 # Running Facemap
 

facemap/pose/model_loader.py

@@ -11,8 +11,8 @@
 from pathlib import Path
 from urllib.request import urlretrieve
 
-MODEL_PARAMS_URL = "https://www.facemappy.org/models/facemap_model_params.pth"
-MODEL_STATE_URL = "https://www.facemappy.org/models/facemap_model_state.pt"
+MODEL_PARAMS_URL = "https://osf.io/download/67f00beaba4331d9888b7f36/"
+MODEL_STATE_URL = "https://osf.io/download/67f00be8959068ade6cf70f1/"
 
 
 def get_data_dir():
@@ -158,3 +158,6 @@ def get_model_files():
     # Read the file
     filenames = file_readobject.read().splitlines()
     return filenames
+
+get_model_params_path()
+get_basemodel_state_path()

facemap/pose/pose.py

@@ -153,7 +153,7 @@ def set_model(self, model_selected=None):
                 self.model_name = model_paths[model_names.index(model)]
                 break
         print("Loading model state from:", self.model_name)
-        self.net.load_state_dict(torch.load(self.model_name, map_location=self.device))
+        self.net.load_state_dict(torch.load(self.model_name, map_location=self.device, weights_only=False))
         self.net.to(self.device)
 
     def load_model(self):
@@ -168,7 +168,7 @@ def load_model(self):
             GUIobject=self.GUIobject,
             prompt="Loading model... {}".format(model_params_file),
         )
-        model_params = torch.load(model_params_file, map_location=self.device)
+        model_params = torch.load(model_params_file, map_location=self.device, weights_only=False)
         # self.bodyparts = model_params["params"]["bodyparts"]
         channels = model_params["params"]["channels"]
         kernel_size = 3

tests/conftest.py

@@ -8,6 +8,7 @@
 from glob import glob
 from pathlib import Path
 from urllib.request import urlopen
+import zipfile
 
 import pytest
 from tqdm import tqdm
@@ -41,47 +42,23 @@ def bodyparts():
     ]
     return BODYPARTS
 
+def extract_zip(cached_file, url, data_path):
+    download_url_to_file(url, cached_file)        
+    with zipfile.ZipFile(cached_file,"r") as zip_ref:
+        zip_ref.extractall(data_path)
 
 @pytest.fixture(scope="session")
 def data_dir(video_names):
     fm_dir = Path.home().joinpath(".facemap")
     fm_dir.mkdir(exist_ok=True)
+    extract_zip(fm_dir.joinpath("data.zip"), "https://osf.io/download/67f025b541d31bf67eb256dd/", fm_dir)
     data_dir = fm_dir.joinpath("data")
-    data_dir.mkdir(exist_ok=True)
-    data_dir_cam1 = data_dir.joinpath("cam1")
-    data_dir_cam1.mkdir(exist_ok=True)
-    data_dir_cam2 = data_dir.joinpath("cam2")
-    data_dir_cam2.mkdir(exist_ok=True)
-
-    for i, video_name in enumerate(video_names):
-        url = "https://www.facemappy.org/test_data/" + video_name
-        if "1" in video_name:
-            cached_file = str(data_dir_cam1.joinpath(video_name))
-        else:
-            cached_file = str(data_dir_cam2.joinpath(video_name))
-        if not os.path.exists(cached_file):
-            download_url_to_file(url, cached_file)
-
     return data_dir
 
 
 @pytest.fixture(scope="session")
 def expected_output_dir(data_dir):
     expected_output_dir = data_dir.joinpath("expected_output")
-    expected_output_dir.mkdir(exist_ok=True)
-    # Download expected output files
-    download_url_to_file(
-        "https://www.facemappy.org/test_data/single_video_proc.npy",
-        expected_output_dir.joinpath("single_video_proc.npy"),
-    )
-    download_url_to_file(
-        "https://www.facemappy.org/test_data/multi_video_proc.npy",
-        expected_output_dir.joinpath("multi_video_proc.npy"),
-    )
-    download_url_to_file(
-        "https://www.facemappy.org/test_data/cam1_test_FacemapPose.h5",
-        expected_output_dir.joinpath("cam1_test_FacemapPose.h5"),
-    )
     return expected_output_dir