commit 81f812ed27d0dfe95430a3930021ed45ba05b099 · pyrox.dev/nixpkgs

+5 -9

pkgs/development/python-modules/open-clip-torch/default.nix

···

       24
       24
        
         pandas,

     

       25
       25
        
         transformers,

     

       26
       26
        
         webdataset,

     

       27
       27
       -
       

     

       28
       28
       -
         stdenv,

     

       29
       27
        
       }:

     

       30
       28
        
       buildPythonPackage rec {

     

       31
       29
        
         pname = "open-clip-torch";

     

       32
       32
       -
         version = "3.1.0";

     

       30
       30
       +
         version = "3.2.0";

     

       33
       31
        
         pyproject = true;

     

       34
       32
        
       

     

       35
       33
        
         src = fetchFromGitHub {

     

       36
       34
        
           owner = "mlfoundations";

     

       37
       35
        
           repo = "open_clip";

     

       38
       36
        
           tag = "v${version}";

     

       39
       39
       -
           hash = "sha256-xDXxhncX0l9qwbV4Gk4rOROH6Qyit/FSTgjrg4Vbk1s=";

     

       37
       37
       +
           hash = "sha256-k4/u0XtfBmPSVKfEK3wHqJXtKAuUNkUnk1TLG2S6PPs=";

     

       40
       38
        
         };

     

       41
       39
        
       

     

       42
       40
        
         build-system = [ pdm-backend ];

     
···

       77
       75
        
           "test_inference_with_data"

     

       78
       76
        
           "test_pretrained_text_encoder"

     

       79
       77
        
           "test_training_mt5"

     

       78
       78
       +
       

     

       80
       79
        
           # fails due to type errors

     

       81
       80
        
           "test_num_shards"

     

       82
       82
       -
         ]

     

       83
       83
       -
         ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [

     

       81
       81
       +
       

     

       82
       82
       +
           # hangs forever

     

       84
       83
        
           "test_training"

     

       85
       85
       -
           "test_training_coca"

     

       86
       86
       -
           "test_training_unfreezing_vit"

     

       87
       87
       -
           "test_training_clip_with_jit"

     

       88
       84
        
         ];

     

       89
       85
        
       

     

       90
       86
        
         meta = {

+13 -33

pkgs/development/python-modules/webdataset/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       3
        
         buildPythonPackage,

     

       5
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         curl,

     

       6
       6
        
       

     

       7
       7
        
         # build-system

     

       8
       8
        
         setuptools,

     
···

       22
       22
        
       }:

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "webdataset";

     

       25
       25
       -
         version = "0.3.2";

     

       25
       25
       +
         version = "1.0.2";

     

       26
       26
        
         pyproject = true;

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "webdataset";

     

       30
       30
        
           repo = "webdataset";

     

       31
       31
       -
           tag = "v${version}";

     

       32
       32
       -
           hash = "sha256-gjZTLf0MqSNCxyAd0H1vCF4ZptIRlY2G3l6KGTwp/Ek=";

     

       31
       31
       +
           # recent versions are not tagged on GitHub

     

       32
       32
       +
           rev = "0773837ecd298587fc89c4f944ef346ef1a6b619";

     

       33
       33
       +
           hash = "sha256-jFFRp5W9yP1mKi9x43EdOakFAd9ArnDqH3dnvFOeCmc=";

     

       33
       34
        
         };

     

       34
       35
        
       

     

       36
       36
       +
         postPatch = ''

     

       37
       37
       +
           substituteInPlace src/webdataset/gopen.py \

     

       38
       38
       +
             --replace-fail \

     

       39
       39
       +
               '"curl"' \

     

       40
       40
       +
               '"${lib.getExe curl}"'

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       35
       43
        
         build-system = [

     

       36
       44
        
           setuptools

     

       37
       45
        
         ];

     
···

       53
       61
        
       

     

       54
       62
        
         pythonImportsCheck = [ "webdataset" ];

     

       55
       63
        
       

     

       56
       56
       -
         preCheck = ''

     

       57
       57
       -
           export WIDS_CACHE=$TMPDIR

     

       58
       58
       -
         '';

     

       59
       59
       -
       

     

       60
       64
        
         disabledTests = [

     

       61
       61
       -
           # requires network

     

       65
       65
       +
           # Require network

     

       62
       66
        
           "test_batched"

     

       63
       67
        
           "test_cache_dir"

     

       64
       64
       -
           "test_concurrent_download_and_open"

     

       65
       68
        
           "test_dataloader"

     

       66
       69
        
           "test_decode_handlers"

     

       67
       70
        
           "test_decoder"

     

       68
       68
       -
           "test_download"

     

       69
       71
        
           "test_handlers"

     

       70
       72
        
           "test_pipe"

     

       71
       73
        
           "test_remote_file"

     

       72
       74
        
           "test_shard_syntax"

     

       73
       75
        
           "test_torchvision"

     

       74
       76
        
           "test_unbatched"

     

       75
       75
       -
           "test_yaml3"

     

       76
       76
       -
         ]

     

       77
       77
       -
         ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       78
       78
       -
           # pickling error

     

       79
       79
       -
           "test_background_download"

     

       80
       80
       -
         ]

     

       81
       81
       -
         ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [

     

       82
       82
       -
           "test_concurrent_access"

     

       83
       83
       -
         ]

     

       84
       84
       -
         ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [

     

       85
       85
       -
           # segfaults on aarch64-linux

     

       86
       86
       -
           "test_webloader"

     

       87
       87
       -
           "test_webloader2"

     

       88
       88
       -
           "test_webloader_repeat"

     

       89
       89
       -
           "test_webloader_unbatched"

     

       90
       90
       -
         ];

     

       91
       91
       -
       

     

       92
       92
       -
         disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [

     

       93
       93
       -
           # Issue with creating a temp file in the sandbox

     

       94
       94
       -
           "tests/wids/test_wids_mmtar.py"

     

       95
       95
       -
           # hangs the build *after* the tests

     

       96
       96
       -
           "tests/webdataset/test_loaders.py"

     

       97
       77
        
         ];

     

       98
       78
        
       

     

       99
       79
        
         meta = {