Skip to content

Commit

Permalink
There is a recent pull request that using the new --shuffle option fo…
Browse files Browse the repository at this point in the history 
…r testing for concurrency issues PR#590 found an issue. After looking into it there was indeed atleast two problems that this commit fixed.
  • Loading branch information
@ANGSD
ANGSD committed Aug 20, 2023
1 parent 2d1c533 commit e3ac916
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Expand Up @@ -105,7 +105,7 @@ version.h:

.PHONY: all clean install install-all install-misc misc test

misc: analysisFunction.o bfgs.o prep_sites.o
misc: analysisFunction.o bfgs.o prep_sites.o aio.o chisquare.o .WAIT
$(MAKE) -C misc HTSSRC="$(realpath $(HTSSRC))"

-include $(OBJ:.o=.d)
Expand All @@ -119,7 +119,7 @@ misc: analysisFunction.o bfgs.o prep_sites.o
$(CXX) -MM $(CXXFLAGS) $*.cpp >$*.d


angsd: version.h $(OBJ)
angsd: version.h .WAIT $(OBJ)
$(CXX) $(FLAGS) -o angsd *.o $(LIBS)


Expand Down

1 comment on commit e3ac916

@ANGSD
Copy link
Owner Author

@ANGSD ANGSD commented on e3ac916 Aug 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an alternative fix to the pull request suggested here #590 . This fix uses the .WAIT within the Makefile. There was also an issue where some dependencies in the misc was not defined properly in the outer Makefile.

Please sign in to comment.