[go: nahoru, domu]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bleeding-edge with get_median_count changes to Hashtable & Mac OS X dylib "fixes" #4

Merged
merged 172 commits into from
Feb 5, 2013
Merged

Commits on Jan 30, 2012

  1. Quick test of code review functionality using a a file that I committed.

    Eric McDonald authored and em committed Jan 30, 2012
    Configuration menu
    Copy the full SHA
    3d172f2 View commit details
    Browse the repository at this point in the history
  2. Testing GitHub/Lighthouse integation. [#15 state:resolved]

    Eric McDonald committed Jan 30, 2012
    Configuration menu
    Copy the full SHA
    39a4b9c View commit details
    Browse the repository at this point in the history
  3. Testing GitHub/Lighthouse integation. [#1 state:resolved]

    Eric McDonald committed Jan 30, 2012
    Configuration menu
    Copy the full SHA
    071a2b4 View commit details
    Browse the repository at this point in the history
  4. Testing GitHub/Lighthouse integation. [#1 state:resolved]

    Eric McDonald committed Jan 30, 2012
    Configuration menu
    Copy the full SHA
    b9c32e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2012

  1. Remove test file.

    Eric McDonald committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    2512e6b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    468fac3 View commit details
    Browse the repository at this point in the history
  3. Import Tim Brom's Makefile for the SMP FAST{A,Q} parsers from his 'sm…

    …p_filtering' branch.
    Eric McDonald committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    ebacd78 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2012

  1. Integrate multi-threaded parsers into FASTA consume-and-tag method fo…

    …r Hashbits.
    
    Add KHMER_THREADED macro for conditional compilation with multi-threading support.
    Wrap serial and parallel parsers in a namespace so that they can coexist (for easier porting).
    Eric McDonald committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    88114b9 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2012

  1. Configuration menu
    Copy the full SHA
    f791e11 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2012

  1. Remove 'main' function from 'parsers.cc' so that linker does not get …

    …confused when linking it into a driver program.
    Eric McDonald committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    93b53bb View commit details
    Browse the repository at this point in the history
  2. Break large critical section in 'consume_fasta_and_tag' into smaller …

    …ones for debugging purposes. Fix bug with 'seq' variable not being declared thread-private.
    Eric McDonald committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    e6e3882 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    13dd75f View commit details
    Browse the repository at this point in the history
  4. Import 'primes.hh' from Tim Brom's branch so that his driver program …

    …will build properly.
    Eric McDonald committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    8c69e79 View commit details
    Browse the repository at this point in the history
  5. Improve build support for driver programs.

    Allow 'load_graph' to test counting hashes or hashbits.
    Add parallel reading support to 'consume_fasta' in 'hashtable.cc'.
    Replace a constant literal with a named constant for parallel read chunk size.
    Prevent build of incomplete driver program 'consume_prof'.
    Eric McDonald committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    533219a View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2012

  1. Restructure Makefile slightly for improved consistency and ability to…

    … modify.
    
    Add TAU profiling support to Makefile.
    Rename 'test.cc' to 'ktable_test.cc' so that the 'test' target doesn't confuse 'make'.
    Eric McDonald committed Feb 8, 2012
    Configuration menu
    Copy the full SHA
    8e509e0 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2012

  1. Normalize reads (convert to all uppercase chars) before verifying them.

    Add flag to compile code with extra sanity checking (with about a 15% to 20% performance loss).
    Create high performance macro version of the 'toupper' function and use for normalization.
    Use quicker code when extra sanity checking disabled: reduce number of calls to the 'toupper' function.
    Eric McDonald committed Feb 13, 2012
    Configuration menu
    Copy the full SHA
    0d71a37 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2012

  1. Break down critical sections into smaller critical sections and atomi…

    …c operations.
    
    (EXPERIMENTAL) Allow slightly sloppy high counts in multi-threaded operation.
    Reduce MAX_COUNT threshold for counting hash bins to accomodate some slop from multiple threads crossing the threshold.
    Eric McDonald committed Feb 16, 2012
    Configuration menu
    Copy the full SHA
    06394de View commit details
    Browse the repository at this point in the history
  2. Add support for writing out a hashtable to the 'load_graph' driver pr…

    …ogram.
    Eric McDonald committed Feb 16, 2012
    Configuration menu
    Copy the full SHA
    d93a8a0 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'refactor' into mt-reader

    Eric McDonald committed Feb 16, 2012
    Configuration menu
    Copy the full SHA
    5cf63b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2012

  1. Improve output of 'load_graph' driver program.

    Eric McDonald committed Feb 21, 2012
    Configuration menu
    Copy the full SHA
    73a0236 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2012

  1. Create configuration interface, 'khmer:: Config', in C++ API.

    Create Python wrapper for 'khmer:: Config'.
    Create methods to get and set the number of threads in the configuration interface.
    Create methods to get hash bin counting thresholds in the configuration interface.
    Only allow number of threads to be set when codes are built with 'KHMER_THREADED' defined.
    Note: C++ API allows multiple config objects (with one active at any given time), but Python wrapper effectively works with a singleton for now. The bookkeeping required to keep the wrapper objects synchronized with the underlying API does not seem worth the dubious benefit of multiple config objects at this time.
    Eric McDonald committed Feb 28, 2012
    Configuration menu
    Copy the full SHA
    95420a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2012

  1. Create tests for khmer:: Config.

    Tweak Python wrapper slightly for more cosmetic output in interpreter.
    Ensure that driver programs are linked with khmer_config.o.
    Eric McDonald committed Mar 1, 2012
    Configuration menu
    Copy the full SHA
    9161135 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2012

  1. Hoist user-tweakable knobs from lib/Makefile to Makefile.

    Refine interaction between lib/Makefile and the build of the bundled zlib.
    Dynamically generate python/setup.py according to user-tweakable knobs which are set. (Automatically maintains consistency with what is built in lib.)
    Eric McDonald committed Mar 2, 2012
    Configuration menu
    Copy the full SHA
    981822e View commit details
    Browse the repository at this point in the history
  2. No longer track and ignore automatically generated python/setup.py in…

    … version control.
    
    Breakout the automatic generation of setup.py into a separate make rule.
    Eric McDonald committed Mar 2, 2012
    Configuration menu
    Copy the full SHA
    d6f61bc View commit details
    Browse the repository at this point in the history
  3. Merge branch 'refactor' into mt-reader

    Eric McDonald committed Mar 2, 2012
    Configuration menu
    Copy the full SHA
    02dd1ec View commit details
    Browse the repository at this point in the history
  4. Add 'has_extra_sanity_checks' method to 'khmer:: Config'.

    Update Python wrapper and tests accordingly.
    Eric McDonald committed Mar 2, 2012
    Configuration menu
    Copy the full SHA
    26034f5 View commit details
    Browse the repository at this point in the history
  5. Fix tests to accomodate the case where extra sanity checks are not in…

    … force. (I.e., beware of consuming lowercase characters.)
    Eric McDonald committed Mar 2, 2012
    Configuration menu
    Copy the full SHA
    5e1327c View commit details
    Browse the repository at this point in the history
  6. Properly cleanup Python wrapper directory when clean invoked from top…

    …-level makefile.
    Eric McDonald committed Mar 2, 2012
    Configuration menu
    Copy the full SHA
    c6eccd5 View commit details
    Browse the repository at this point in the history
  7. Place test output in a temp directory rather than in the soruce data …

    …directory.
    Eric McDonald committed Mar 2, 2012
    Configuration menu
    Copy the full SHA
    d1401c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2012

  1. Configuration menu
    Copy the full SHA
    b82e6ce View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2012

  1. Configuration menu
    Copy the full SHA
    3472f45 View commit details
    Browse the repository at this point in the history
  2. Ignore failure of attempt to use 'setup.py' to clean the build, if it…

    … has not been generated. (Handle multiple successive cleanings without breaking.)
    Eric McDonald committed Mar 9, 2012
    Configuration menu
    Copy the full SHA
    c55d3af View commit details
    Browse the repository at this point in the history
  3. Fix previous bug fix of parser code.

    Eric McDonald committed Mar 9, 2012
    Configuration menu
    Copy the full SHA
    bfaa260 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2012

  1. Parse argument of 'set_number_of_threads' as signed rather than unsig…

    …ned int so that attempts to set negative numbers of threads can be caught and handled properly.
    Eric McDonald committed Mar 12, 2012
    Configuration menu
    Copy the full SHA
    f7fa1ef View commit details
    Browse the repository at this point in the history
  2. Fix bug in thread-safe readmask setter.

    (Doh! It helps to use the atomic operation you intended (compare-and-swap) rather than the one your fingers actually wrote (add).)
    (Adding 0 to a variable having a value of 1 is not the same as setting that variable to 0. :-)
    The entire automated test suite now passes with the threaded code.
    Eric McDonald committed Mar 12, 2012
    Configuration menu
    Copy the full SHA
    f555596 View commit details
    Browse the repository at this point in the history
  3. Cleanup of OMP parallel parameters declaration.

    Eric McDonald committed Mar 12, 2012
    Configuration menu
    Copy the full SHA
    4fb0c9c View commit details
    Browse the repository at this point in the history
  4. Bug fix to multi-threaded parser. Only assert that a valid read name …

    …was found if not at end of file. (Technically, one could question rather this should be an assert or whether it should throw an exception.)
    Eric McDonald committed Mar 12, 2012
    Configuration menu
    Copy the full SHA
    46ad1da View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2012

  1. Use config interface to get size of sloppy hash bins in kmer-counting…

    … logic.
    Eric McDonald committed Mar 13, 2012
    Configuration menu
    Copy the full SHA
    33c2f1c View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2012

  1. merged Jason's Cython adapter

    ctb committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    2c9fa0f View commit details
    Browse the repository at this point in the history
  2. Replace some coarse-grained critical sections with fine-grained atomi…

    …c operations.
    
    Fuse testing for and setting kmer presence bits in Bloom filter hash tables into a single function for reasons of hopefully-improved efficiency and adding thread safety.
    Cleanup and simplify declaration of OpenMP parallel region in 'consume_fasta_and_tag'.
    Note: More performance testing and tuning must still be done. Some pieces of code related to this have been left in, wrapped in conditional compilation constructs.
    Eric McDonald committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    034e886 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2012

  1. Change hash bin sloppiness formula in config interface.

    Update tests of config interface accordingly.
    Eric McDonald committed Mar 15, 2012
    Configuration menu
    Copy the full SHA
    a23f0f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2012

  1. WARNING: This is a broken commit. Everything builds with the Python C…

    … API or with Cython, but not everything tests out.
    
    Merge branch 'merge_cython' into mt-reader
    
    Conflicts:
    	lib/parsers.cc
    	lib/parsers.hh
    	python/Makefile
    	python/setup.py.in
    Eric McDonald committed Mar 21, 2012
    Configuration menu
    Copy the full SHA
    f37d934 View commit details
    Browse the repository at this point in the history
  2. Rename _khmermodule.cc.orig back to _khmermodule.cc.

    Eric McDonald committed Mar 21, 2012
    Configuration menu
    Copy the full SHA
    5530cbc View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2012

  1. Hack support for Config interface into Cython.

    NOTE: The 'get_config' method is not quite right, due to the way Cython handles C++ references.
    Eric McDonald committed Mar 22, 2012
    Configuration menu
    Copy the full SHA
    b7d0692 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2012

  1. Comment out test corresponding to 'collect_high_abundance_kmers', whi…

    …ch is disabled in Cython interface.
    Eric McDonald committed Mar 26, 2012
    Configuration menu
    Copy the full SHA
    39f48bc View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2012

  1. Undo breakage caused by importing 'new_counting_hash' as 'new_hashtab…

    …le' in Cython merge.
    Eric McDonald committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    cac6cda View commit details
    Browse the repository at this point in the history
  2. Clean up directories from tests which abort abnormally.

    Eric McDonald committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    fc33418 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2012

  1. Handle differences between CPython API and Cython interfaces with a c…

    …rude try-except hack during imports.
    Eric McDonald committed Mar 28, 2012
    Configuration menu
    Copy the full SHA
    700f644 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into mt-reader

    Eric McDonald committed Mar 28, 2012
    Configuration menu
    Copy the full SHA
    4fae6e8 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'qp_refactor' into mt-reader

    NOTE: The 'test_count_overlap_cpp' test may be broken. Rest of commit should be good though.
    
    Conflicts:
    	lib/hashbits.cc
    	lib/hashbits.hh
    	tests/test_scripts.py
    Eric McDonald committed Mar 28, 2012
    Configuration menu
    Copy the full SHA
    8c581bb View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2012

  1. Merge branch 'qp_refactor' into mt-reader

    Note: All tests now pass. However, one test requires 'matplotlib' (which requires 'NumPy'). We may wish to make the execution of this test depedent on the availability of 'matplotlib' on the user's system or else make 'matplotlib' a prerequistite for the 'khmer' package.
    
    Conflicts:
    	tests/test_scripts.py
    Eric McDonald committed Apr 2, 2012
    Configuration menu
    Copy the full SHA
    8abeb66 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2012

  1. Create config API controls for whether threading is used when parsing…

    … reads files and the stride length to be used by threaded reads parsers.
    Eric McDonald committed Apr 4, 2012
    Configuration menu
    Copy the full SHA
    5461f45 View commit details
    Browse the repository at this point in the history
  2. Add Cython wrappings for expanded config interface.

    Eric McDonald committed Apr 4, 2012
    Configuration menu
    Copy the full SHA
    2d1f5ce View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2012

  1. Add bzip2 library to khmer build process. (Not used anywhere yet, tho…

    …ugh.)
    
    Rework 'lib/Makefile' for a simpler zlib dependency graph.
    Eric McDonald committed Apr 5, 2012
    Configuration menu
    Copy the full SHA
    0f747f9 View commit details
    Browse the repository at this point in the history
  2. Rename 'zlib-1.2.3' directory to 'zlib' for brevity of compilation li…

    …nes.
    
    Make changes associated with the rename.
    Improve the setup.py template to be more readable and hackable.
    Eric McDonald committed Apr 5, 2012
    Configuration menu
    Copy the full SHA
    8163523 View commit details
    Browse the repository at this point in the history
  3. Ignore generated files in lib/bzip2 directory.

    Eric McDonald committed Apr 5, 2012
    Configuration menu
    Copy the full SHA
    5064073 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' into mergethon

    Resolve conflicts.
    
    Conflicts:
    	lib/Makefile
    	lib/hashtable.cc
    	lib/hashtable.hh
    Eric McDonald committed Apr 5, 2012
    Configuration menu
    Copy the full SHA
    775abc6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ef14bcc View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2012

  1. Create stream readers for new parser architecture. Create test harnes…

    …s for new stream readers.
    Eric McDonald committed Apr 14, 2012
    Configuration menu
    Copy the full SHA
    e69d5e2 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2012

  1. Configuration menu
    Copy the full SHA
    ba85665 View commit details
    Browse the repository at this point in the history
  2. Initial implementation of cache manager to interface with stream read…

    …ers.
    
    Note: This commit includes a bug when appending a wrapped-around ssegment to a psegment.
    Note: This implementation is not efficient across multiple NUMA nodes. Needs to be rewritten so that cache segments are allocated separately on demand rather than as part of one large pool which will be biased to the physical memory of the master thread.
    Eric McDonald committed Apr 24, 2012
    Configuration menu
    Copy the full SHA
    ce31de6 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2012

  1. New implementation of cache manager code. Should be much more NUMA-fr…

    …iendly and also does not have any bugs I am aware of from thinking about the code. Now on to finding and fixing those of which I am not aware....
    Eric McDonald committed Apr 26, 2012
    Configuration menu
    Copy the full SHA
    85b64f6 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2012

  1. Capture per-thread timing data for the various wait loops and reading…

    … from the stream.
    Eric McDonald committed Apr 28, 2012
    Configuration menu
    Copy the full SHA
    de9a461 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2012

  1. Create tester for cache manager used by the reads parsers.

    Instrument cache manager debug tracing and performance measurement logic.
    Fix enough logic bugs for multi-threaded tests to successfully complete.
    Eric McDonald committed May 7, 2012
    Configuration menu
    Copy the full SHA
    c1cf929 View commit details
    Browse the repository at this point in the history
  2. Petty cosmetic fix.

    Eric McDonald committed May 7, 2012
    Configuration menu
    Copy the full SHA
    33b566a View commit details
    Browse the repository at this point in the history
  3. Fix a bug where a solo cache manager thread could lock itself out.

    Fix a bug where a byte reader function could be using the wrong cache segment size.
    Eric McDonald committed May 7, 2012
    Configuration menu
    Copy the full SHA
    fe545ef View commit details
    Browse the repository at this point in the history
  4. Write cache manager performance metrics to a trace file. (Note: Shoul…

    …d probably store in a metrics object instead.)
    Eric McDonald committed May 7, 2012
    Configuration menu
    Copy the full SHA
    8f6f897 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2012

  1. Create FASTA parser. Minor tweaks elsewhere in the read_parsers code.…

    … Still need to test.
    Eric McDonald committed May 9, 2012
    Configuration menu
    Copy the full SHA
    f6aea68 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2012

  1. Create performance metrics objects. Apply them to stream readers and …

    …cache managers. (Still need to test.)
    Eric McDonald committed May 10, 2012
    Configuration menu
    Copy the full SHA
    4da0a28 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2012

  1. Create TraceLogger class. Use TraceLogger instances to trace executio…

    …n of cache manager segments. (Note: Still need to test.)
    Eric McDonald committed May 12, 2012
    Configuration menu
    Copy the full SHA
    a440712 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2012

  1. Improve cache segment allocation logic.

    Add performance metrics and execution tracing to the parser interface.
    (Still need to test.)
    Eric McDonald committed May 15, 2012
    Configuration menu
    Copy the full SHA
    c164e98 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2012

  1. Fix dependency issue in 'lib/Makefile' where test program .o files wo…

    …uld not be regenerated on change of a header which the corresponding source used.
    Eric McDonald committed May 16, 2012
    Configuration menu
    Copy the full SHA
    1c821c9 View commit details
    Browse the repository at this point in the history
  2. Create test harness for reconstructed parser infrastructure.

    Fix bug where data was being lost if a cache segment fill occurred in the midst of copying memory to a parser buffer.
    Eric McDonald committed May 16, 2012
    Configuration menu
    Copy the full SHA
    44c3120 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2012

  1. Bug fix. In CPython API, register the type of khmer Config objects as…

    … being the Python built-in 'type'. Having a metaclass allows the object attributes to be listed and type to be determined. (Imagine that....)
    Eric McDonald committed May 17, 2012
    Configuration menu
    Copy the full SHA
    08a7f13 View commit details
    Browse the repository at this point in the history
  2. Delete 'get_byte' method from CacheManager.

    Add parameter for tracking segment and setaside buffer boundaries to 'get_bytes' method in CacheManager.
    Temporarily add deeper tracing to parser for debugging purposes.
    Fix bug which caused overlapping reads and a segmentation fault from an invalid split position.
    Eric McDonald committed May 17, 2012
    Configuration menu
    Copy the full SHA
    0fd1059 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2012

  1. Fix bug where the sequence line appender logic was not checking wheth…

    …er a fil l segment boundary had been crossed.
    Eric McDonald committed May 19, 2012
    Configuration menu
    Copy the full SHA
    a23ea1b View commit details
    Browse the repository at this point in the history

Commits on May 21, 2012

  1. Fix bug where a read was being skipped because the completed state wa…

    …s being flagged prematurely (before the parser buffer was fully consumed).
    Eric McDonald committed May 21, 2012
    Configuration menu
    Copy the full SHA
    0476c69 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2012

  1. Refine tracer output to be more useful for hunting what is hopefully …

    …the final parser bug.
    Eric McDonald committed May 22, 2012
    Configuration menu
    Copy the full SHA
    c970333 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2012

  1. Improve cache manager and read parser diagnostics for bug hunting.

    Fix bug where first seqment fill would make a setaside buffer of size 0, causing fill segment 1 to erroneously believe that it did not have an extension. (I.e., fix an off-by-one error.)
    Eric McDonald committed May 23, 2012
    Configuration menu
    Copy the full SHA
    2286881 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2012

  1. Another one-line change to fix a bug where the cache manager's 'copy_…

    …bytes' function was not checking if a cache segment was still valid and was recopying bytes from the start of the segment after the cursor was reset to there during a segment maintenance in which the segment was invalidated (due to end of stream being reached).
    
    (No more known bugs in the cache manager and parser logic as of this commit.)
    Eric McDonald committed May 24, 2012
    Configuration menu
    Copy the full SHA
    8b5fca4 View commit details
    Browse the repository at this point in the history
  2. Cleanup of cache manager- and parser-related code.

    Eric McDonald committed May 24, 2012
    Configuration menu
    Copy the full SHA
    91197c6 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into mergethon

    Eric McDonald committed May 24, 2012
    Configuration menu
    Copy the full SHA
    3d82dda View commit details
    Browse the repository at this point in the history
  4. Merge branch 'mt-reader' into mergethon

    Eric McDonald committed May 24, 2012
    Configuration menu
    Copy the full SHA
    3d3c1c9 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into bleeding-edge

    Eric McDonald committed May 24, 2012
    Configuration menu
    Copy the full SHA
    2c5e49e View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2012

  1. Configuration menu
    Copy the full SHA
    3027cf5 View commit details
    Browse the repository at this point in the history
  2. Set the default trace level to be 'TLVL_NONE' rather than 0, which is…

    … 'TLVL_ALL'. Shuffle some includes from the read parsers implementation file to the read parsers header file.
    Eric McDonald committed Jun 5, 2012
    Configuration menu
    Copy the full SHA
    46935c6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6eb5965 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2012

  1. Refactor TraceLogger class into a separate set of files.

    Eric McDonald committed Jun 6, 2012
    Configuration menu
    Copy the full SHA
    7edbd58 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2012

  1. Merge in Titus' changes to ged-lab:master.

    Eric McDonald committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    92232f1 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'refactor' into bleeding-edge

    Eric McDonald committed Jun 22, 2012
    Configuration menu
    Copy the full SHA
    59aa3a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2012

  1. Merge branch 'refactor' into bleeding-edge

    Fix from QP to remove dependency upon the 'matplotlib' package.
    
    Conflicts:
    	tests/test_scripts.py
    Eric McDonald committed Jun 25, 2012
    Configuration menu
    Copy the full SHA
    4ce6669 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f183c20 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2012

  1. Integrate rewritten parser logic into counting hashes. (Still need to…

    … fix a possible bug, but code executes without crashing.)
    Eric McDonald committed Jun 28, 2012
    Configuration menu
    Copy the full SHA
    b2913ca View commit details
    Browse the repository at this point in the history
  2. Merge branch 'bleeding-edge' into mt-reader

    Eric McDonald committed Jun 28, 2012
    Configuration menu
    Copy the full SHA
    3bc5109 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6ce6ebd View commit details
    Browse the repository at this point in the history
  4. Fix some linking problems in Python wrapper.

    Eric McDonald committed Jun 28, 2012
    Configuration menu
    Copy the full SHA
    a169638 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2012

  1. Do not open or close trace files if 'WITH_INTERNAL_TRACING' is not de…

    …fined.
    Eric McDonald committed Jul 3, 2012
    Configuration menu
    Copy the full SHA
    3632f09 View commit details
    Browse the repository at this point in the history
  2. Add macro for switching between original parser and new parser for te…

    …sting purposes. (The hashtables produced by the original parser and single-threaded operation of the new parser are currently indentical, btw.)
    Eric McDonald committed Jul 3, 2012
    Configuration menu
    Copy the full SHA
    b4519aa View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2012

  1. Create intelligent hashtable differ. (Still need to add support for b…

    …igcounts and for sloppy counting.)
    Eric McDonald committed Jul 20, 2012
    Configuration menu
    Copy the full SHA
    162794b View commit details
    Browse the repository at this point in the history
  2. (Addition to commit 162794b.)

    Eric McDonald committed Jul 20, 2012
    Configuration menu
    Copy the full SHA
    8636775 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2012

  1. Configuration menu
    Copy the full SHA
    9916df3 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2012

  1. Rip readmask functionality out of 'consume_fasta'.

    Delete 'consume_fasta_build_readmask' method and interfaces to it.
    Update test suite accordingly.
    Eric McDonald committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    d7c8982 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2012

  1. Add Hasher helper class to Hashtable.

    Eric McDonald committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    f99f343 View commit details
    Browse the repository at this point in the history
  2. Make separate category for auxiliary programs such as 'ht-diff' and m…

    …ake sure that programs in this category are deleted when the 'clean' target is invoked.
    Eric McDonald committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    0c357c0 View commit details
    Browse the repository at this point in the history
  3. Convert from using old single-threaded parser as the default to using…

    … the new threadsafe parser as the default.
    
    Remove OMP dependencies from 'lib/hashtable.cc'.
    Cleanup some disabled debugging logic no longer used.
    Add per-thread execution tracing to 'consume_fasta' method.
    Initialize read and k-mer counters in Python wrappers prior to passing them to 'consume_fasta'. (This is needed for threadsafe counting.)
    Eric McDonald committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    ffe262d View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2012

  1. Extend Read struct to accommodate members found in Screed read records.

    Rename the 'seq' member of the Read struct 'sequence' and update sources accordingly.
    Eric McDonald committed Aug 9, 2012
    Configuration menu
    Copy the full SHA
    8b114c3 View commit details
    Browse the repository at this point in the history
  2. Wrap Read and ReadParser objects in CPython. (Still need to do Cython…

    … and write tests.)
    Eric McDonald committed Aug 9, 2012
    Configuration menu
    Copy the full SHA
    2673f50 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2012

  1. Cython wrappers for IParser and Read objects. (Still need to expose t…

    …o 'khmer' module and write tests.)
    Eric McDonald committed Aug 14, 2012
    Configuration menu
    Copy the full SHA
    934daa2 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2012

  1. Import wrapped Read and IParser classes into 'khmer' module. (Incompl…

    …ete. Still need to clean up some.)
    Eric McDonald committed Aug 15, 2012
    Configuration menu
    Copy the full SHA
    0d9707d View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2012

  1. Manual merge from 'master' branch.

    Eric McDonald committed Oct 10, 2012
    Configuration menu
    Copy the full SHA
    e51a6b5 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2012

  1. Merge from 'bleeding-edge' branch of 'ged-lab' repo.

    Eric McDonald committed Oct 22, 2012
    Configuration menu
    Copy the full SHA
    0af7f74 View commit details
    Browse the repository at this point in the history
  2. Improve efficiency of copy from cache segment into line buffer.

    (Thanks to Eric Norige for noticing this. Somehow I overlooked it....)
    Eric McDonald committed Oct 22, 2012
    Configuration menu
    Copy the full SHA
    3f52559 View commit details
    Browse the repository at this point in the history
  3. Allow 'HashTable' objects to be used by multiple threads.

    Use multiple threads in the 'HashTable' test driver.
    Eric McDonald committed Oct 22, 2012
    Configuration menu
    Copy the full SHA
    1bb5df9 View commit details
    Browse the repository at this point in the history
  4. Partial brain dump about future directions.

    Eric McDonald committed Oct 22, 2012
    Configuration menu
    Copy the full SHA
    52a8756 View commit details
    Browse the repository at this point in the history
  5. Prep input streams with posix_fadvise(2).

    (TODO: Add O_DIRECT support for raw streams from regular files.)
    (Could've sworn that I had already started that task previously....)
    Eric McDonald committed Oct 22, 2012
    Configuration menu
    Copy the full SHA
    89dabd4 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2012

  1. Add O_DIRECT support to RawStreamReader with aligned memory where nee…

    …ded.
    Eric McDonald committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    7e236e8 View commit details
    Browse the repository at this point in the history
  2. Merge from branch 'bleeding-edge' in 'ged-lab' repo.

    Eric McDonald committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    2ac3dc6 View commit details
    Browse the repository at this point in the history
  3. Refactor IPerformanceMetrics to separate files.

    Eric McDonald committed Oct 23, 2012
    Configuration menu
    Copy the full SHA
    6a17d1f View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2012

  1. Stake out places to gather timing data.

    Clean up code: tighten down a conditional compilation, remove a stray OMP directive.
    Improve performance: precalculate MAX_COUNT and MAX_BIGCOUNT and store with HashTable object.
    Eric McDonald committed Oct 24, 2012
    Configuration menu
    Copy the full SHA
    03e04e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2012

  1. Create HashTablePerformanceMetrics.

    Improve efficiency of DNA string validator.
    Eric McDonald committed Oct 25, 2012
    Configuration menu
    Copy the full SHA
    c525893 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2012

  1. Add conditional compilation of performance metrics.

    Eric McDonald committed Oct 28, 2012
    Configuration menu
    Copy the full SHA
    e529133 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2012

  1. Ignore error if 'zlib' directory already clean and the automatically-…

    …generated makefile is missing.
    Eric McDonald committed Oct 30, 2012
    Configuration menu
    Copy the full SHA
    4ee9ca1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    041d52b View commit details
    Browse the repository at this point in the history
  3. Add '-pg' flag during linking when 'gprof' profiling is enabled.

    (Bug: Threads hang if the code is not built with internal tracing enabled. Need to fix.)
    Eric McDonald committed Oct 30, 2012
    Configuration menu
    Copy the full SHA
    d451fe0 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2012

  1. Quicker toupper for sequence normalization.

    Eric McDonald committed Nov 7, 2012
    Configuration menu
    Copy the full SHA
    d874577 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3b4b613 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2012

  1. Merge with 'master' branch from 'ged-lab/khmer'.

    Eric McDonald committed Nov 8, 2012
    Configuration menu
    Copy the full SHA
    b9f27e0 View commit details
    Browse the repository at this point in the history
  2. Merge with branch 'bleeding-edge' from 'ged-lab/khmer'.

    Eric McDonald committed Nov 8, 2012
    Configuration menu
    Copy the full SHA
    f595ce4 View commit details
    Browse the repository at this point in the history
  3. Reduce overhead by changing some defaults.

    Eric McDonald committed Nov 8, 2012
    Configuration menu
    Copy the full SHA
    ee371bd View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2012

  1. Configuration menu
    Copy the full SHA
    c08fff8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5a42baa View commit details
    Browse the repository at this point in the history
  3. Merge pull request #3 from edvenson/5a42baae16a2db9c9f94a1463abe8b84b…

    …dbf46e6
    
    changes from os x build experience
    Eric McDonald committed Nov 9, 2012
    Configuration menu
    Copy the full SHA
    97c68e3 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2012

  1. Merge branch 'master' from 'ged-lab/khmer'.

    Eric McDonald committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    6bc8fcc View commit details
    Browse the repository at this point in the history
  2. Merge branch 'bleeding-edge' from 'ged-lab/khmer'.

    Eric McDonald committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    ebddccf View commit details
    Browse the repository at this point in the history
  3. Add TODO item about hunting for more memory leaks.

    Eric McDonald committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    c1c6e48 View commit details
    Browse the repository at this point in the history
  4. Conditionally compile an attempt to open with O_DIRECT for Linux only.

    (Thanks to Greg Edvenson for catching this.)
    Eric McDonald committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    c298926 View commit details
    Browse the repository at this point in the history
  5. Fix conditional compilation issue in Hashbits counting logic. (Still …

    …need to test this more.)
    Eric McDonald committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    4b53942 View commit details
    Browse the repository at this point in the history
  6. Prevent shared compression libs from building. (Increase portability …

    …and decrease build time.)
    
    (Thanks to Greg Edvenson for reporting a bzip2 shared lib build problem on MacOS X.)
    Eric McDonald committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    53496a2 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'bleeding-edge' from 'ged-lab/khmer'.

    Eric McDonald committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    d2a5465 View commit details
    Browse the repository at this point in the history
  8. Blindly attempt to get the thread ID for Mac OS X and other platforms…

    … unknown.
    Eric McDonald committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    5d7c0f9 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2012

  1. Rip out remnants of threadedParsers and OMP stuff from core implement…

    …ation.
    Eric McDonald committed Nov 13, 2012
    Configuration menu
    Copy the full SHA
    00cb24c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    37efa3a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a8adbbe View commit details
    Browse the repository at this point in the history
  4. Set thread-safety on everywhere. (Finish removing 'KHMER_THREADED' co…

    …nditional compilation.)
    
    Remove all compilation and linking flags related to OMP, except in the tests where they are used.
    Eric McDonald committed Nov 13, 2012
    Configuration menu
    Copy the full SHA
    f63544c View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2012

  1. Disable execution tracing by default.

    Hackishly fix a thread-deadlock bug by periodically issuing memory barriers in the busy waiters used for synchronization. (Bug generally appearied when execution tracing is disabled.)
    (Note: Still need to think about causality of bug and possibly a different synchronization scheme.)
    Eric McDonald committed Nov 14, 2012
    Configuration menu
    Copy the full SHA
    18938aa View commit details
    Browse the repository at this point in the history
  2. Disable execution tracing by default.

    Hackishly fix a thread-deadlock bug by periodically issuing memory barriers in the busy waiters used for synchronization. (Bug generally appeared when execution tracing was disabled.)
    (Note: Still need to think about causality of bug and possibly a different synchronization scheme.)
    Eric McDonald committed Nov 14, 2012
    Configuration menu
    Copy the full SHA
    bd7ba27 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6f32cc7 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2012

  1. Notes to self.

    Eric McDonald committed Nov 15, 2012
    Configuration menu
    Copy the full SHA
    6c76430 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2012

  1. Include <cstdint> from 'khmer.hh'.

    Simplify 'khmer_config.hh' by removing map as storage.
    Remove methods which are no longer relevant from 'khmer_config.hh'.
    Remove nosetests and wrapper methods which correspond to deleted methods.
    Eric McDonald committed Nov 16, 2012
    Configuration menu
    Copy the full SHA
    fb7c2f0 View commit details
    Browse the repository at this point in the history
  2. Ignore Vim backup files in 'python' directory.

    Eric McDonald committed Nov 16, 2012
    Configuration menu
    Copy the full SHA
    d3aca29 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4117b6f View commit details
    Browse the repository at this point in the history
  4. Ignore Vim backup files in the 'tests' directory.

    Eric McDonald committed Nov 16, 2012
    Configuration menu
    Copy the full SHA
    9466686 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2012

  1. Fix all errors and warnings for Cython builds.

    Pass most tests with Cythoned build.
    (Note: The Cythoned code appears to have a memory leak or, at least, be a larger memory hog. Need to investigate.)
    Eric McDonald committed Nov 17, 2012
    Configuration menu
    Copy the full SHA
    c8e7255 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2012

  1. Remove unneeded 'consume_genome' code and script.

    Eric McDonald committed Nov 19, 2012
    Configuration menu
    Copy the full SHA
    b78a274 View commit details
    Browse the repository at this point in the history
  2. Zero performance metrics stopwatches on platforms which might not sup…

    …port clock_gettime(2).
    Eric McDonald committed Nov 19, 2012
    Configuration menu
    Copy the full SHA
    fdec650 View commit details
    Browse the repository at this point in the history
  3. Factor 'ThreadIDMap' into separate files.

    Eric McDonald committed Nov 19, 2012
    Configuration menu
    Copy the full SHA
    c557915 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2012

  1. Generalize and refactor 'get_next_read' logic. Hoist to base class: I…

    …Parser.
    
    Create '_parse_read' methods for FastaParser and FastqParser classes.
    Clean up 'test-Parser.cc'.
    (Still need to test FASTQ parser, but refactored FASTA parser works for 1 thread, at least.)
    Eric McDonald committed Nov 20, 2012
    Configuration menu
    Copy the full SHA
    2beca79 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2012

  1. Configuration menu
    Copy the full SHA
    3a9b78c View commit details
    Browse the repository at this point in the history
  2. Fix bug in multi-threaded FASTA/FASTQ parsing. (Introduced by recent …

    …refactoring/generalization.)
    Eric McDonald committed Nov 21, 2012
    Configuration menu
    Copy the full SHA
    689dbe4 View commit details
    Browse the repository at this point in the history
  3. Hoist inclusion of <exception> to 'khmer.hh'. Place a common exceptio…

    …n sublcass there as well.
    
    Create config interfaces for tuning the trace levels of the input buffer manager and the reads parsers.
    Eric McDonald committed Nov 21, 2012
    Configuration menu
    Copy the full SHA
    e8e91b8 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2012

  1. Add some additional execution tracing to input buffer manager.

    Fix bug which masks a deeper bug (unfixed).
    (Bug: Exception not being thrown for all bad parses which are expected to be good parses.)
    (Deeper Bug: Setaside buffer not being set before it is needed. Causes some data to be skipped which leads to bad parses.)
    (Note: Will probably switch to using copyaside buffers instead of setaside buffers to fix deeper bug.)
    (Note: Copyaside buffers will also make async input easier to implement.)
    Eric McDonald committed Nov 22, 2012
    Configuration menu
    Copy the full SHA
    6179f39 View commit details
    Browse the repository at this point in the history
  2. Conditionally compile the writing of per-thread summary logs in C++ p…

    …arser test driver program.
    Eric McDonald committed Nov 22, 2012
    Configuration menu
    Copy the full SHA
    0404b28 View commit details
    Browse the repository at this point in the history
  3. Replace setaside buffering with copyaside buffering.

    Finish disconnecting old parsers from everything.
    Fix bug in tests of khmer Config object, where values were not being reset after tests.
    Fix bug in parsing, stemming from segment start being detected per line rather than per record.
    Eric McDonald committed Nov 22, 2012
    Configuration menu
    Copy the full SHA
    9edf582 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2012

  1. Add thread-safety to 'bigcount' overflow bins for Bloom filter k-mer …

    …counting.
    Eric McDonald committed Nov 28, 2012
    Configuration menu
    Copy the full SHA
    6718562 View commit details
    Browse the repository at this point in the history
  2. Initialize k-mer counter spinlocks to 0 for 'bigcounts'.

    Eric McDonald committed Nov 28, 2012
    Configuration menu
    Copy the full SHA
    08619f8 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2012

  1. Configuration menu
    Copy the full SHA
    fc3ce5a View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2012

  1. Configuration menu
    Copy the full SHA
    ddd7457 View commit details
    Browse the repository at this point in the history
  2. Update documentation on load-into-counting script.

    Eric McDonald committed Dec 1, 2012
    Configuration menu
    Copy the full SHA
    10beac7 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2013

  1. Merge branch 'master'.

    Eric McDonald committed Jan 25, 2013
    Configuration menu
    Copy the full SHA
    e5d30dc View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2013

  1. Merge branch 'master' into bleeding-edge. This updates bleeding-edge …

    …with the get_median_count move into Hashtable.
    
    Conflicts:
    	lib/Makefile
    	lib/hashbits.cc
    	lib/hashtable.cc
    	lib/hashtable.hh
    ctb committed Feb 2, 2013
    Configuration menu
    Copy the full SHA
    f2b80d6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5e147e1 View commit details
    Browse the repository at this point in the history
  3. removed unused variable

    ctb committed Feb 2, 2013
    Configuration menu
    Copy the full SHA
    65e60af View commit details
    Browse the repository at this point in the history