Ignore:
Timestamp:
Apr 10, 2022, 2:53:18 PM (4 years ago)
Author:
JiadaL <j82liang@…>
Branches:
ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
d8e2a09
Parents:
4559b34 (diff), 6256891 (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:

Resolve conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/theses/thierry_delisle_PhD/thesis/Makefile

    r4559b34 r92538ab  
    2929PICTURES = ${addsuffix .pstex, \
    3030        base \
     31        base_avg \
    3132        empty \
    3233        emptybit \
     
    3839        system \
    3940        cycle \
     41        result.cycle.jax.ops \
    4042}
    4143
     
    112114        python3 $< $@
    113115
     116build/result.%.ns.svg : data/% | ${Build}
     117        ../../../../benchmark/plot.py -f $< -o $@ -y "ns per ops"
     118
     119build/result.%.ops.svg : data/% | ${Build}
     120        ../../../../benchmark/plot.py -f $< -o $@ -y "Ops per second"
     121
    114122## pstex with inverted colors
    115123%.dark.pstex : fig/%.fig Makefile | ${Build}
Note: See TracChangeset for help on using the changeset viewer.