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

Merge upstream changes #98

Merged
merged 49 commits into from
Mar 23, 2021
Merged

Merge upstream changes #98

merged 49 commits into from
Mar 23, 2021

Commits on Mar 9, 2021

  1. [batch] Worker cleanup (hail-is#10155)

    * [batch] Worker cleanup
    
    * more changes
    
    * wip
    
    * delint
    
    * additions?
    
    * fix
    jigold authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    556fedf View commit details
    Browse the repository at this point in the history
  2. [query] Add source_file_field to import_table (hail-is#10164)

    * [query] Add `source_file_field` to `import_table`
    
    CHANGELOG: Add `source_file_field` parameter to `hl.import_table` to allow lines to be associated with their original source file.
    
    * ugh
    tpoterba authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    7a45835 View commit details
    Browse the repository at this point in the history
  3. [ci] add authorize sha and action items table to user page (hail-is#1…

    …0142)
    
    * [ci] add authorize sha and action items table to user page
    
    * [ci] track review requested in addition to assigned for PR reviews
    daniel-goldstein authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    31459ac View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f2b980f View commit details
    Browse the repository at this point in the history
  5. [batch] add more logs and do not wait for asyncgens (hail-is#10136)

    * [batch] add more logs and do not wait for asyncgens
    
    I think there is some unresolved issue with asyncgen shutdown that is keeping
    workers alive. This is not an issue in worker because worker calls sys.exit
    which forcibly stops execution. cc: @daniel-goldstein @jigold.
    
    * fix lint
    danking authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    e395f6d View commit details
    Browse the repository at this point in the history
  6. [query-service] maybe fix event loop not initialized (hail-is#10153)

    * [query-service] maybe fix event loop not initialized
    
    The event loop is supposed to be initialized in the main thread. Sometimes
    our tests get placed in the non-main thread (always a thread named Dummy-1).
    Hopefully the session-scoped fixture is run in the main thread.
    
    * fix
    danking authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    db45839 View commit details
    Browse the repository at this point in the history
  7. [prometheus] add prometheus to track SLIs (hail-is#10165)

    * [prometheus] add prometheus to track SLIs
    
    * add wraps
    daniel-goldstein authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    7fa37a6 View commit details
    Browse the repository at this point in the history
  8. [query] apply nest-asyncio as early as possible (hail-is#10158)

    * [query] apply nest-asyncio as early as possible
    
    * fix
    danking authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    831abfb View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    09dd086 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. Configuration menu
    Copy the full SHA
    18042cc View commit details
    Browse the repository at this point in the history
  2. [query] Remove verbose print (hail-is#10167)

    Looks like this got added in some dndarray work
    tpoterba authored Mar 10, 2021
    Configuration menu
    Copy the full SHA
    c456b7e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bcb0f3b View commit details
    Browse the repository at this point in the history
  4. [query-service] fix receive logic (hail-is#10159)

    * [query-service] fix receive logic
    
    Only one coro waits on receive now. We still error if a message is sent before
    we make our first response.
    
    * fix
    
    * fix
    danking authored Mar 10, 2021
    Configuration menu
    Copy the full SHA
    dd29d2b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    251d681 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. [linting] add curlylint check for any service that renders jinja2 (ha…

    …il-is#10172)
    
    * [linting] add curlylint check for any service that renders jinja2 templates
    
    * [linting] spaces not tabs
    daniel-goldstein authored Mar 11, 2021
    Configuration menu
    Copy the full SHA
    434ba4a View commit details
    Browse the repository at this point in the history
  2. [website] fix website (hail-is#10173)

    * [website] fix website
    
    I build old versions of the docs and use them in new websites. This does not
    work for versions of the docs before I introduced the new system. In particular
    versions 0.2.63 and before generate old-style docs.
    
    * tutorials are templated
    danking authored Mar 11, 2021
    Configuration menu
    Copy the full SHA
    723233f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d4689bf View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f5e497a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fee24a8 View commit details
    Browse the repository at this point in the history
  6. [query-service] remove service backend tests (hail-is#10180)

    They are too flaky currently due to the version issue.
    danking authored Mar 11, 2021
    Configuration menu
    Copy the full SHA
    e47e71b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    42847e4 View commit details
    Browse the repository at this point in the history
  8. Release 0.2.64 (hail-is#10183)

    * Bump version number
    
    * Updated changelog
    johnc1231 authored Mar 11, 2021
    Configuration menu
    Copy the full SHA
    1ef7018 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    72dc5ee View commit details
    Browse the repository at this point in the history
  10. [query-service] teach query service to read MTs and Ts created by Spa…

    …rk (hail-is#10184)
    
    * [query-service] teach query service to read MTs and Ts created by Spark
    
    Hail-on-Spark uses HadoopFS which emulates directories by creating size-zero files with
    the name `gs://bucket/dirname/`. Note: the object name literally ends in a slash. Such files
    should not be included in `listStatus` (they should always be empty anyway). Unfortunately,
    my fix in hail-is#9914 was wrong because `GoogleStorageFileStatus` removes
    the trailing slash. This prevented the path from matching `path`, which always ends in a `/`.
    
    * fix
    danking authored Mar 11, 2021
    Configuration menu
    Copy the full SHA
    2d8ba29 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. Configuration menu
    Copy the full SHA
    fbf6233 View commit details
    Browse the repository at this point in the history
  2. [googlestoragefs] ignore the directory check entirely (hail-is#10185)

    * [googlestoragefs] ignore the directory check entirely
    
    If a file exists with the *same name as the directory we are listing*,
    then it must be a directory marker. It does not matter if that file is
    a directory or not.
    
    * Update GoogleStorageFS.scala
    danking authored Mar 15, 2021
    Configuration menu
    Copy the full SHA
    9de3415 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d463980 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Configuration menu
    Copy the full SHA
    9df985a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1443fbc View commit details
    Browse the repository at this point in the history
  3. [query] NDArray Sum (hail-is#10187)

    * Attempt implementing the sum rule in Emit
    
    * Connected the python code, but not working yet
    
    * NDArrayExpression.sum is working now
    
    * Add default arg when no axis is provided
    
    * More comprehensive test
    
    * Unused imports
    
    * Use sum appropriately in linear_regression_rows_nd
    
    * Deleted extra blank line
    
    * Don't use typeToTypeInfo, make NumericPrimitives the source of these decisions
    
    * Better assertions, with tests
    
    * Got the summation index correct
    
    * Add documentation
    johnc1231 authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    321047b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    79cc76b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    383069d View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. [query] BlockMatrix map (hail-is#10195)

    * Add map, but protect users of the spark backend from writing arbitrary maps
    
    * If densify would have been a no-op, that should work
    
    * Densify and Sparsify are no-ops for now
    
    * Rename map to map_dense and map_sparse. Give better implementations for add, multiply, divide, subtract of a scalar
    
    * Make the maps underscore methods
    johnc1231 authored Mar 17, 2021
    Configuration menu
    Copy the full SHA
    0fcc1e9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d89225 View commit details
    Browse the repository at this point in the history
  3. [ci] make test hello speak https (hail-is#10192)

    * [tls] make hello use tls
    
    * change pylint ignore message
    daniel-goldstein authored Mar 17, 2021
    Configuration menu
    Copy the full SHA
    022d02f View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. [query] blanczos_pca dont do extra loading work (hail-is#10201)

    * Use the checkpointed table from mt_to_table_of_ndarray to avoid recomputing mt
    
    * Keep extra row fields from being included
    johnc1231 authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    466f3c3 View commit details
    Browse the repository at this point in the history
  2. Add query graceful shutdown for rolling updates (hail-is#10106)

    * Merge pull request #35 from populationgenomics/add-query-graceful-shutdown
    
    Add query graceful shutdown
    
    * Remove unused argument from query:on_shutdown
    illusional authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    8e1a9f1 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. [auth] add more options for obtaining session id for dev credentials (h…

    …ail-is#10203)
    
    * [auth] add more options for obtaining session id for dev credentials
    
    * [auth] extract userinfo query for use in both userinfo and verify_dev_credentials
    
    * remove unused import
    daniel-goldstein authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    9df5c2e View commit details
    Browse the repository at this point in the history
  2. [query] Default to Spark 3 (hail-is#10054)

    * Change hail to use spark3 and scala 2.12 by default, change build_hail_spar3 to instead test spark2 for backwards support
    
    * Update Makefile
    
    * Update dataproc image version
    
    * Scale down the dataproc version, since latest dataproc is using Spark release candidate
    
    * Update pyspark version in requirements.txt
    
    * Bump scala/spark patch versions
    
    * We want to use the newer py4j jar when using spark 3
    
    * Upgrade json4s
    
    * I now want Spark 3.1.1, since it's been released
    
    * Upgrade to 3.1.1 in the Makefile, fix a deprecateed IOUtils method
    
    * Update pyspark as well
    
    * Don't update json4s
    
    * Try upgrading version
    
    * Fixed issue for constructing bufferspecs
    
    * Should at least be using newest one
    
    * Remove abstracts from type hints
    
    * Revert "Remove abstracts from type hints"
    
    This reverts commit 1e0d194.
    
    * Things don't go well if I don't use the same json4s version as Spark
    
    * Mixed a typeHintFieldName
    
    * See if this fixes my BlockMatrixSparsity issue
    
    * json4s can't handle a curried apply method
    
    * This works so long as the jar file is included in the libs directory
    
    * Makefile changes to support pulling elasticsearch
    
    * Use dataproc image for Spark 3.1.1
    
    * Update patch version of dataproc image, no longer uses Spark RC
    
    * Fixed up Makefile, now correctly depends on copying the jar
    
    * Now we just check that the specified version is 7, as that's all we support
    
    * Delete build_hail_spark2, we can't support spark2
    
    * Version checks for Scala and Spark
    
    * Updated installation docs
    
    * Spark versions warning
    
    * Update some old pysparks
    johnc1231 authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    a5304d8 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. [batch] Add more info to UI pages (hail-is#10070)

    * [batch] Add more info to UI pages
    
    * fixes
    
    * addr comment
    
    * addr comments
    jigold authored Mar 22, 2021
    Configuration menu
    Copy the full SHA
    f475cb6 View commit details
    Browse the repository at this point in the history
  2. Bump jinja2 from 2.10.1 to 2.11.3 in /docker (hail-is#10209)

    Bumps [jinja2](https://github.com/pallets/jinja) from 2.10.1 to 2.11.3.
    - [Release notes](https://github.com/pallets/jinja/releases)
    - [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst)
    - [Commits](pallets/jinja@2.10.1...2.11.3)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Mar 22, 2021
    Configuration menu
    Copy the full SHA
    0521e09 View commit details
    Browse the repository at this point in the history
  3. [docker][hail] update to latest pytest (hail-is#10177)

    * [docker][hail] update to latest pytest
    
    Issues like this https://ci.hail.is/batches/221291/jobs/112 do not appear locally for me,
    I suspect this is due to my using a much newer pytest.
    
    * fix many tests incorrectly using pytest
    
    * another one
    
    * remove unnecessary pip installs in service test dockerfiles
    
    * fix
    danking authored Mar 22, 2021
    Configuration menu
    Copy the full SHA
    c76da66 View commit details
    Browse the repository at this point in the history
  4. [gateway] Cut out router and router-resolver from gateway internal ro…

    …uting (hail-is#10207)
    
    * [gateway] cut out router-resolver from internal auth flow
    
    * [gateway] cut out router from internal
    daniel-goldstein authored Mar 22, 2021
    Configuration menu
    Copy the full SHA
    a88fcd5 View commit details
    Browse the repository at this point in the history
  5. [datasets] add pan-ukb datasets (hail-is#10186)

    * add available pan-ukb datasets
    
    * add rst files for schemas
    
    * reference associated variant indices HT in the block matrix descriptions
    pwc2 authored Mar 22, 2021
    Configuration menu
    Copy the full SHA
    1a4aebc View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. [query] Add json warn context to parse_json (hail-is#10160)

    We don't test the logs, but I did test this manually, it works as
    expected.
    tpoterba authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    c14bce4 View commit details
    Browse the repository at this point in the history
  2. [query] fix tmp_dir default in init(), which doesn't work for the ser…

    …vice backend (hail-is#10199)
    
    * Fix tmp_dir default, which doesn't work for the service backend.
    
    * Fix type for tmp_dir.
    lgruen authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    357844b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8aee9a5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d457460 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3ad57ea View commit details
    Browse the repository at this point in the history