diff --git a/Projet/CODE/apm/Makefile b/Projet/CODE/apm/Makefile index 0f3cf7cdfe216050d64f4ccdfcc3cae64fcd252a..ecb8e1884e9c44118e4c59f97f516ff61047d29a 100644 --- a/Projet/CODE/apm/Makefile +++ b/Projet/CODE/apm/Makefile @@ -1,31 +1,29 @@ -SRCD=src -OBJD=obj -INCLUDED=include +ICLUDED=include CC=gcc -CFLAGS=-O3 -I $(INCLUDED) +CFLAGS=-O3 -I $(INCLUDED) -pg -g LDFLAGS= -OBJ=$(OBJD)/apm.o +OBJ=obj/apm.o .PHONY: all -all: apm apm_omp apm_gpu +all: dir apm apm_omp #apm_gpu -$(OBJD): - mkdir -p $(OBJD) +dir: + mkdir -p obj -$(OBJD)/%.o: $(OBJD) $(SRCD)/%.c +obj/%.o: src/%.c $(CC) $(CFLAGS) -c -o $@ $^ -apm: apm.o +apm: obj/apm.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -apm_omp: - $(CC) $(CFLAGS) $(LDFLAGS) -p $@ $^ +apm_omp: obj/apm_omp.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ apm_gpu: - $(CC) $(CFLAGS) $(LDFLAGS) -p $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -.PHHONY: clean +.PHONY: clean clean: - rm -rf apm apm_omp apm_gpu $(OBJD) + rm -rf apm apm_omp apm_gpu obj/ *.out diff --git a/Projet/CODE/apm/dna/small_chrY_no_return.fa b/Projet/CODE/apm/dna/small_chrY_no_return.fa new file mode 100644 index 0000000000000000000000000000000000000000..f743fe4468662faa63b7d84e8ae2af559a8644be --- /dev/null +++ b/Projet/CODE/apm/dna/small_chrY_no_return.fa @@ -0,0 +1 @@ +AGAAGAGCACCTGGTTGATAACCCAGTTCCCATCTGGGATTTAGGGGACCTGGACAGCCCGGAAAATGAGCTCCTCATCTCTAACCCAGTTCCCCTGTGGGGATTTAGGGGACCAGGGACAGCCCGTTGCATGAGCCCCTGGACTCTAACCCAGTTCCCTTCTGGAATTTAGGGGCCCTGGGACAGCCCTGTACATGAGCTCCTGGTCTGTAACACAGTTCCCCTGTGGGGATTTAGGGACTTGGGCCTTCTGTCTTTGGGATCTACTCTCTATGGGCCACACAGATATGTCTTCCAACTTCCCTACACAGGGGGGACTTCAAAGAGTGCCTTGAGCTGATCTGGTGATTGCTTTTTTGTACTGTTATTTATCTTATTCTTTTCATTGTGAGGTACTGATGCAAACACTTTGTACGAAAAGGTCTTTCTCATCTCGGGAGTCCCCGTCTATTTGTCCCGGTCCCTGTTAACCCAGTCCCCGACAGGAGCCCCTTCTGCACCTTGAGCTCTCACCACTCACCGTCCATCCAGCCCCAGCTCTGCCTGCAACCCACCCATCCCTGGGACTCGGGCCTCCCCTCTCTAGTGGTCTGGTCATCAGGCCAGGGGCACGTGGAAGAAGCTATCGTGGCAAAGGGAGCAGTCATATCCCCAAAATCTGTGGTTGGTTTACCACCACCATGGAAACCCCAGGGTGGGACTCTAGTTTCAGGTTGGAGCTGAGCCCTGTCGGGAATGAGCTTTCCCCAGCTATGGCTTCTTGGGGCCCCTGTGCCCTGAGCTGTGTCTCCCAGCATCGGGTCCCCACCATGCATATGGCCCACTCAGGCACAGTGCCGCGATGGCTGCATGCGTGAGGGGGGCCTGGGCCCAGGGCTGGGAGTCCTTTGTGTCTCATGGCCATGATTGTCCTTCCGAGTATGATATGGTGGCCAATTTCTTTTATTCTGTCGTTCAGAGTGAGTAAATGATGTAGAGTTCATGCAGAAAAAAATACAACAAAAACCAAGGGAACATAGAATTGGAAAACGCGTCACAGCAATGAGTTAAATAGGTAACAAATTTCATCATTTGAAGAAAGACTTAGAGTGCCAAAAGTGCCTCTTAAGTCTCCTTTAAAAAGTAGCAAAATTCATCCCTGAAGAAGCATCTTGGCCTTTTTCATGTACTCAGAGTGCTGGTGAAGAACAAAGATTGCTGAAACATTATGTACCTAACAGCGTTACAGGGTGTAGATAACACACTGGAAAACCTGGTCGTTACAGTGGACATATTCCAGGAAGTCCTTGCCTGAGGTTTT diff --git a/Projet/CODE/apm/src/apm.c b/Projet/CODE/apm/src/apm.c index f83b72c96b897ed5edb24cd9652510e7db862f27..1c3e60c29aaf32be05c7fef5087b4701e1e03a23 100644 --- a/Projet/CODE/apm/src/apm.c +++ b/Projet/CODE/apm/src/apm.c @@ -28,7 +28,6 @@ read_input_file( char * filename, int * size ) return NULL ; } - /* Get the number of characters in the textfile */ fsize = lseek(fd, 0, SEEK_END); lseek(fd, 0, SEEK_SET);