Changeset d2b939c in sasmodels for sasmodels/kernelcl.py


Ignore:
Timestamp:
Feb 7, 2017 12:34:46 PM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
3a45c2c
Parents:
b8ddf2e (diff), fe8ff99 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into ticket-794

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kernelcl.py

    rb8ddf2e rd2b939c  
    294294        # so we don't really need to cache things for ourselves.  I'll do so 
    295295        # anyway just to save some data munging time. 
    296         key = "%s-%s%s"%(name, dtype, ("-fast" if fast else "")) 
     296        tag = generate.tag_source(source) 
     297        key = "%s-%s-%s%s"%(name, dtype, tag, ("-fast" if fast else "")) 
    297298        # Check timestamp on program 
    298299        program, program_timestamp = self.compiled.get(key, (None, np.inf)) 
Note: See TracChangeset for help on using the changeset viewer.