Commit d61d6ae
[Dynamic Selection] Customization of Backends and Policies (#2508)
* adding missing condition for scratch space use
* initial policy base plus round robin inheriting
* initial policy customization - policy base plus inherited round robin
* fixed resource policy using the policy_base
* adding exception in select
* Deactivating policies beside RR for custom backend testing
* default base + RR updates for default sycl backend
* adding missed updated sycl_backend
* updating fixed resource policy and test to use default sycl backend
* updating dynamic load policy to use default sycl backend
* updating the auto_tune policy to use the default sycl backend
* split submit into instument_before, function invocation and instrument after, also removed submit from the sycl_backend. Now uses the base implementation
* updating the backend traits with a scratch space for selection
* warning fix from previous push
* adding missing condition for scratch space use
* initial policy base plus round robin inheriting
* initial policy customization - policy base plus inherited round robin
* fixed resource policy using the policy_base
* adding exception in select
* updates to enable non-sycl samples plus a traits check for wait
* enabling fixed_resource_policy for non-sycl samples
* initial update to enable dynamic_load_policy for non-sycl samples
* Adding wait_type
* adding resource_type to the test
* Update round_robin_policy.h
* Update round_robin_policy.h
* Update fixed_resource_policy.h
* Update test_fixed_resource_policy_inline.pass.cpp
* Update dynamic_load_policy.h
* Update dynamic_load_policy.h
* Update test_dynamic_load_policy_inline.pass.cpp
* Update test_dynamic_load_utils.h
* Update dynamic_load_policy.h
* Update sycl_backend.h
* Update dynamic_load_policy.h
* using default backend
* Update test_internal_sycl_scheduler.pass.cpp
* Update test_internal_sycl_scheduler.pass.cpp
* Update sycl_backend.h
* Update sycl_backend.h
* Update test_auto_tune_policy_sycl.pass.cpp
* Update test_auto_tune_policy_inline.pass.cpp
* Update dynamic_selection_traits.h
* Update sycl_backend.h
* Update dynamic_selection_traits.h
* Update sycl_backend.h
* adding first available policy
* adding token policy
* Dynamic Selection Adding ResourceAdapter to support queue* (#2367)
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixes to use ResourceAdapter
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing static assertion
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding missing resource adapter
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding missing include
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* updating auto_tune_policy to use adapter
* enabling non-sycl round_robin tests
* enabling non-sycl dynamic_load tests
* checking for ext_oneapi_queue_profiling_tag support from the auto tune policy
* replacing instrument_before and after with a single submit
* enabling fixed resource policy with the adapter update
* fix default submit implementation
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* initial inline_backend update with int auto_tune tests
* updates to remove select and convert to try_select, multiple submits
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adjustments for tests removal of select
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixes for customization tests
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* inline tests removal of select, adjust to use adapter
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* relocate report to internal namespace
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* some fixes for sycl backend with adapter
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* update of documentation
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding an end event to scratch_space and async_waiter in the sycl_backend
* minor fixes
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding qualifiers to report
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* -> not .
formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* improvments for scratch space, simplify async waiter
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* cleaning up public seleciton type / wait_type
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* moving report-based resource filtering from auto_tune policy to backend + report-based filtering updates to dynamic_load_policy
* adding assertions for supported reporting requirements
* clang-format
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* strip ::std -> std
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing first_available_policy
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove unnecessary code
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* comment fix
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* always need default backend include
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* make end event private
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* whitespace fix
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing some redundant test code
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* always filter devices for profiling (not just default)
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* using the internal helper contains_reporting_req_v for reporting requirement check
* returning report info back to public namespace
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing reporting reqs passed to backend ctors
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing token policy (temporarily)
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adjustment to docs
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding free function for try_submit
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* improve system around initialization
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* further fixes for ambiguity
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding tests for default initialization of resources, other fixes
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* codespell fixes
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* clang format
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding sycl_backend alias for backward compatibility
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing alias
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* code movement to minimize diff
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* clang format
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove unused variable
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* example fixes nstreams_policies
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Fix CRTP for auto_tune
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix examples
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* clang format
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing tests for non-sycl backends
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing ds inline backend for non sycl backends
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* using declval to satisfy MSVC
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* clang format
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Remove erroneous comment
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* EOF endline
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix for dynamic load policy lazy reporting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove overwrite of index
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* std::optional -> std::shared_ptr
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix typo brace
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix auto type
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* switching devices to gpu
* CTAD for round robin
* simplify submit fallbacks and reduce redundancy
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing unnecessary trait
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* minor cleanups (address feedback)
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* bugfix to avoid returning reference shared ptr payload leaving scope
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* clang formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing year from copyright
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* const function, remove auto
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* restoring unintentional removal of template args
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove optional include
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix static assertion language
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* minor docs fixes
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove optional include
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing selection_type as return in docs
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding CTAD for dynamic_load_policy
* removing thread
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove CRTP from backend_base
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* protect impl functions and make base friend
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding adapter tests for auto_tune_policy
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* addressing minor feedback
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Add comment for evaluation of backoff for try_submit
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing customization tests for coverage
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding usage of sub variable to wait
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Adding test of failing selection
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding CTAD for fixed_resource_policy
* adding a simple backoff after 100 tries
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* clang formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding CTAD for auto_tune_policy
* improve error message
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Update and improve documentation
add information on try_submit
add custom_policies page
add backend page and custom_backends page
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* passing adapter to policy constructor
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing auto_tune_tests
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing reliance on cpu device, formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing requirement for fp64 in auto_tune
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing issue with missing move ctor
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing issues with static_assert(false,...) with some compilers
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* undo overengineered perfect forwarding
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* clang++ fix for ambiguous ctor
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* reverting move wait type
Simplify for what should be a very lightweight type (wait type)
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* hide wait call in SFINAE
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing explicit
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix for custom_backend language
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* explicit template arg
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding iterations for autotune
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* increasing iteration count to make best resource more apparent
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* avoid warning by passing explicit Backend
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* auto_tune fixes
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix filtering for timing
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding ambiguity tests for fixed_resource_policy and auto_tune_policy
* bugfix (add event before adding to list)
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* using profiling tags in ctad tests
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* protecting non-profiling cases for 2023.2 and earlier
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing skip handling and formating
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* use default selector for dynamic load
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* try_submit relocated
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* switch from shared_ptr back to std::optional
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* use free function get_resources
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* restore selection_type as protected in docs
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* rename try_select_impl->try_select
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* rename initialize_impl -> initialize_state
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing reporting requirements
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* explicit mention of CRTP for policy_base
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* BaseResourceTypedefault_backend_impl -> core_resource_backend; BaseResourceType->CoreResourceType
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* static assertion to sycl_backend for wait_type
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* pre-filter queues for auto-tune
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding missing include
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing naming of __select_impl in docs
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove unnecessary aliases / wrapping
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* bug fix for typename
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* improvements for traits, wait_type
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove test
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixes for the toctree
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing see also links
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* taking suggestion
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix example away from using selection
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Update documentation/library_guide/dynamic_selection_api/functions.rst
Co-authored-by: Alexey Kukanov <alexey.kukanov@intel.com>
* update and fix premade policies
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* address feedback
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove incorrect forwarding
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* protect usage of profiling tags
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* address feedback
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* accept suggestion
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* focus on policy_base for customization of policies
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* accept feedback
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix nullptr -> nullopt
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Add high level description of policy structure
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* minor improvements to general section
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding selection_type information to docs
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* restructure and remove verbose example
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Relocating resource adapter section
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* move execution info to custom policies
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* sycl backend supported execution info
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing unnecessary sections
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* cut down custom backend sections
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* reference to lazy reporting from policy customization
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* backend architecture section
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* improving scratch space description
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* Rename section
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* improve looped vector operations
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* further minor improvements
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* addressing documentation feedback
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* numbering constructors
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* preventing horizontal scroll
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* capitalization
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* better rendering for tables
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting attempt 2
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* shorten varname
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* final shortening
Signed-off-by: Dan Hoeflinger
<dan.hoeflinger@intel.com>
* Formatting of note
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting for note
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing unnecessary unwrap
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* address feedback for custom policies
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* better formatting for note and text tweak
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* removing extra space
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fixing std optional
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* address minor feedback
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* improve description of sycl backend
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* improve sycl backend description
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* formatting and link convention
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* fix formatting
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* remove table titles
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
* adding information about sycl backend to function page
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
---------
Signed-off-by: Dan Hoeflinger <dan.hoeflinger@intel.com>
Signed-off-by: Dan Hoeflinger
Co-authored-by: Elvis Fefey <elvis.g.fefey@intel.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Alexey Kukanov <alexey.kukanov@intel.com>1 parent c3ce893 commit d61d6ae
File tree
43 files changed
+3119
-2558
lines changed- documentation/library_guide
- dynamic_selection_api
- examples/dynamic_selection
- nstream/src
- sepia-filter-ds/src
- include/oneapi/dpl
- internal
- dynamic_selection_impl
- test
- parallel_api/dynamic_selection
- sycl
- support
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
43 files changed
+3119
-2558
lines changedLines changed: 67 additions & 82 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
32 | 29 | | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
53 | 43 | | |
54 | | - | |
| 44 | + | |
55 | 45 | | |
56 | | - | |
57 | | - | |
58 | | - | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
59 | 67 | | |
60 | 68 | | |
61 | 69 | | |
| |||
129 | 137 | | |
130 | 138 | | |
131 | 139 | | |
| 140 | + | |
132 | 141 | | |
133 | 142 | | |
134 | 143 | | |
135 | 144 | | |
136 | 145 | | |
137 | 146 | | |
138 | 147 | | |
139 | | - | |
| 148 | + | |
140 | 149 | | |
141 | 150 | | |
142 | 151 | | |
| |||
162 | 171 | | |
163 | 172 | | |
164 | 173 | | |
165 | | - | |
| 174 | + | |
166 | 175 | | |
167 | 176 | | |
168 | | - | |
| 177 | + | |
169 | 178 | | |
170 | 179 | | |
171 | 180 | | |
172 | 181 | | |
173 | | - | |
| 182 | + | |
| 183 | + | |
174 | 184 | | |
175 | | - | |
176 | | - | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
177 | 190 | | |
178 | 191 | | |
179 | 192 | | |
| |||
184 | 197 | | |
185 | 198 | | |
186 | 199 | | |
187 | | - | |
188 | | - | |
| 200 | + | |
| 201 | + | |
189 | 202 | | |
190 | 203 | | |
191 | | - | |
| 204 | + | |
192 | 205 | | |
193 | 206 | | |
194 | | - | |
| 207 | + | |
195 | 208 | | |
196 | 209 | | |
197 | | - | |
| 210 | + | |
| 211 | + | |
198 | 212 | | |
199 | | - | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
200 | 216 | | |
201 | 217 | | |
202 | 218 | | |
| |||
208 | 224 | | |
209 | 225 | | |
210 | 226 | | |
211 | | - | |
| 227 | + | |
212 | 228 | | |
213 | 229 | | |
214 | | - | |
| 230 | + | |
215 | 231 | | |
216 | 232 | | |
217 | | - | |
| 233 | + | |
218 | 234 | | |
219 | 235 | | |
220 | 236 | | |
| |||
224 | 240 | | |
225 | 241 | | |
226 | 242 | | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
Lines changed: 168 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
0 commit comments