xmos-ai-tools 1.3.2.dev303__py3-none-macosx_10_15_universal2.whl → 1.3.2.dev314__py3-none-macosx_10_15_universal2.whl

xmos_ai_tools/runtime/include/lib_tflite_micro/src/thread_call.h

@@ -2,6 +2,11 @@
 #define __micro_thread_library_h__
 
 #include <stdint.h>
+#ifdef __xcore__
+#include <xcore/parallel.h>
+#else
+typedef unsigned synchronizer_t;
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -21,8 +26,6 @@ typedef struct { // THIS STRUCT MUST BE IN SYNC WITH ASSEMBLY CODE.
     uint32_t id[4];         // Actual IDs
   } thread_ids;             // ids of at most 4 threads - live during invoke
   uint32_t synchroniser;    // synchroniser for threads - live during invoke
-  uint32_t nstackwords;     // nstackwords per stack   - live after load model
-  void *UNSAFE stacks;      // pointer to top of stack - live after load model
 } thread_info_t;
 
 
@@ -31,56 +34,15 @@ typedef struct { // THIS STRUCT MUST BE IN SYNC WITH ASSEMBLY CODE.
 typedef void (*thread_function_pointer_t)(void * arg0, void * arg1, void * arg2);
 struct inference_engine;
 
-/** Function that creates threads, then calls a interp_invoke_internal,
- * then destroys threads
- * This function creates four threads for a total of five threads.
- * other versions of the functions create 3, 2, 1, or 0 threads.
- *
- * \param   ie     Pointer to the inference object to be passed to
- *                 interp_invoke_internal
- * \param   ptr    Pointer to a thread_info block. The thread-ids will
- *                 be stored in this block, and a stack pointer is expected
- *                 in this block:
- *                     ptr[0] [out] thread-id-0    (versions with fewer threads
- *                     ptr[1] [out] thread-id-1     will only use the first few
- *                     ptr[2] [out] thread-id-2     slots)
- *                     ptr[3] [out] thread-id-3
- *                     ptr[4] [out] synchroniser-id
- *                     ptr[5] [in]  top of stacks
- *                     ptr[6] [in]  number of words per stack
+/** Function that runs the client task
  */
-int thread_invoke_5(struct inference_engine *ie, thread_info_t *ptr);
-int thread_invoke_4(struct inference_engine *ie, thread_info_t *ptr);
-int thread_invoke_3(struct inference_engine *ie, thread_info_t *ptr);
-int thread_invoke_2(struct inference_engine *ie, thread_info_t *ptr);
-int thread_invoke_1(struct inference_engine *ie, thread_info_t *ptr);
+void thread_client(thread_info_t *ptr, int n);
 
-/** Function that creates threads.
- * This function creates four threads for a total of five threads.
- * other versions of the functions create 3, 2, 1, or 0 threads.
- *
- * \param   ptr    Pointer to a thread_info block. The thread-ids will
- *                 be stored in this block, and a stack pointer is expected
- *                 in this block:
- *                     ptr[0] [out] thread-id-0    (versions with fewer threads
- *                     ptr[1] [out] thread-id-1     will only use the first few
- *                     ptr[2] [out] thread-id-2     slots)
- *                     ptr[3] [out] thread-id-3
- *                     ptr[4] [out] synchroniser-id
- *                     ptr[5] [in]  top of stacks
- *                     ptr[6] [in]  number of words per stack
- */
-void thread_init_5(thread_info_t *ptr);
-void thread_init_4(thread_info_t *ptr);
-void thread_init_3(thread_info_t *ptr);
-void thread_init_2(thread_info_t *ptr);
-void thread_init_1(thread_info_t *ptr);
-/** Function that destroys threads. Must be called from the same function that
- * called an _init_ above.
- *
- * \param   ptr    Pointer to a thread_info block.
+/** Function that runs the client task
  */
-void thread_destroy(thread_info_t *ptr);
+static inline void thread_store_sync(thread_info_t *ptr, uint32_t s) {
+  ptr->synchroniser = s;
+}
 
 /** Function that sets up parameters for one of the client threads
  * This particular one passes the second and third arguments to the thread.
@@ -94,7 +56,21 @@ void thread_destroy(thread_info_t *ptr);
  * \param arg2      Third argument for the thread function
  * \param thread_id The thread_id to initialise; one of ptr[0]..ptr[3] above
  */
-void thread_variable_setup(void * arg1, void * arg2, uint32_t thread_id);
+#ifdef __xcore__
+static inline void thread_variable_setup(void * arg1, void * arg2, uint32_t thread_id) {
+#ifdef __VX4A__
+    asm volatile("xm.tsetr %0, 11, %1" :: "r" (thread_id), "r" (arg1));
+    asm volatile("xm.tsetr %0, 12, %1" :: "r" (thread_id), "r" (arg2));
+    asm volatile("xm.tsetr %0, 24, %1" :: "r" (thread_id), "r" (1));
+#else
+    asm volatile("set t[%0]:r1, %1" :: "r" (thread_id), "r" (arg1));
+    asm volatile("set t[%0]:r2, %1" :: "r" (thread_id), "r" (arg2));
+    asm volatile("set t[%0]:r10, %1" :: "r" (thread_id), "r" (1));
+#endif
+}
+#else
+extern void thread_variable_setup(void * arg1, void * arg2, uint32_t thread_id);
+#endif
 
 /** Function that starts all thread functions and runs them until completion.
  * It is assumed that the variable parts have been set up per thread.

{xmos_ai_tools-1.3.2.dev303.dist-info → xmos_ai_tools-1.3.2.dev314.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmos_ai_tools
-Version: 1.3.2.dev303
+Version: 1.3.2.dev314
 Summary: XMOS AI Tools
 Home-page: https://github.com/xmos/ai_tools
 Author: XMOS
@@ -41,4 +41,4 @@ Dynamic: summary
 Documentation
 -------------
 
-Click [here](https://github.com/xmos/ai_tools/blob/e51b0e1e84fc08d0aad46dfb9ba2d038ccd975ec/README.md) for documentation on using xmos-ai-tools to deploy AI models on xcore.
+Click [here](https://github.com/xmos/ai_tools/blob/e358ca58e3fa05f0132d216e1dfefac098d2bb63/README.md) for documentation on using xmos-ai-tools to deploy AI models on xcore.

{xmos_ai_tools-1.3.2.dev303.dist-info → xmos_ai_tools-1.3.2.dev314.dist-info}/RECORD

@@ -80,7 +80,7 @@ xmos_ai_tools/runtime/include/lib_tflite_micro/api/version.h,sha256=ImFxGU2PzLZ3
 xmos_ai_tools/runtime/include/lib_tflite_micro/api/xcore_config.h,sha256=gywR3hBJe05GTLkcdJss0bmk3dzsWivXK6U9FF7Pfm0,589
 xmos_ai_tools/runtime/include/lib_tflite_micro/api/xcore_device_memory.h,sha256=bLWcRDNrzClLh8_eR3XRRz3sA2pEAzzxGLDoPTsNp8A,1917
 xmos_ai_tools/runtime/include/lib_tflite_micro/api/xcore_shared_config.h,sha256=EdqTecMZIdSk1ZWUE7rdl6ilXe4-vbFiwwcf0Y124c4,1562
-xmos_ai_tools/runtime/include/lib_tflite_micro/src/thread_call.h,sha256=KNG-3gNWMSonzYTGbk4L0kT8WU9JD0bOzlk8naz7JO0,4965
+xmos_ai_tools/runtime/include/lib_tflite_micro/src/thread_call.h,sha256=YobSgoLTISGz3o7mz-ZXiLNlJWnko5R44NmYh8SvxkQ,3206
 xmos_ai_tools/runtime/include/lib_tflite_micro/src/tflite-xcore-kernels/conv2d_float.h,sha256=XfVVWAKhbv6nByOzO1j6WA4oQ4RTX3PvYx22f-_3JFA,7681
 xmos_ai_tools/runtime/include/lib_tflite_micro/src/tflite-xcore-kernels/xcore_custom_options.h,sha256=lC4Tw1Pxxg3zOXRdqNNtokuU-_cX9TTkYmGLe47-9dQ,630
 xmos_ai_tools/runtime/include/lib_tflite_micro/src/tflite-xcore-kernels/xcore_error_reporter.h,sha256=_NIzvBYMqlwJexYESP5t5JXpxYTt-ZKq-1AdqAB9-Sc,812
@@ -380,17 +380,17 @@ xmos_ai_tools/runtime/include/tensorflow/lite/micro/tools/benchmarking/metrics.h
 xmos_ai_tools/runtime/include/tensorflow/lite/micro/tools/benchmarking/op_resolver.h,sha256=g0dl9tzUqngiINvjBlqDclFqvkC85MC4kbU13vE4OkY,6071
 xmos_ai_tools/runtime/include/tensorflow/lite/schema/schema_generated.h,sha256=hSumwEqc-LmMHG82KKl1yPLiVMNbLj_q19-VRPCR7ng,1093175
 xmos_ai_tools/runtime/include/tensorflow/lite/schema/schema_utils.h,sha256=tkHMDPARjIqppYCVInIowwdHxjNP3pfSS9O7vx-ODeo,1333
-xmos_ai_tools/runtime/lib/libhost_xtflitemicro.a,sha256=cm2VQGSPP3myC3Lnv4rrMjX9tmIhHybjtpKIVwKUv7U,2476384
-xmos_ai_tools/runtime/lib/libxtflitemicro.a,sha256=ljU97-QXXi0Wwdkjb3A0IKVrIQrx4pMBOfk-5Wd4iB0,71964212
+xmos_ai_tools/runtime/lib/libhost_xtflitemicro.a,sha256=zNVlVeITK-V46GeccRWRBh-e33bLq1zJr4jpj6b-q1U,2479336
+xmos_ai_tools/runtime/lib/libxtflitemicro.a,sha256=SQU77BXngIHnTu1q9o6_no3cvvMoL93yCSy8cBj9F8E,72202704
 xmos_ai_tools/xformer/__init__.py,sha256=a4K06oiSu2TYVwGvzwMDGGejPUYTvW9-5Uw6SfuFCX4,1903
 xmos_ai_tools/xformer/flash.py,sha256=MG4coi_Lvvg-oQmw1pomJD8eeOH4gAMjixjBFvO2BCk,6376
 xmos_ai_tools/xinterpreters/__init__.py,sha256=PFRB9VxOLKaA--j2ZvWGcmesv2C6uNYqJ_kBam68aUI,50
 xmos_ai_tools/xinterpreters/exceptions.py,sha256=HOjADxHYMPI9mN0YIbWxtw9hSeL2B6XWWwqtGtyJdVs,577
 xmos_ai_tools/xinterpreters/host_interpreter.py,sha256=ZdvzXUnAdnCcSU-dNQvq6ad2MDk9PZqu9UyNoBgBYKI,25755
-xmos_ai_tools/xinterpreters/libs/macos/xtflm_python.1.0.1.dylib,sha256=eZfE3gjspfTd_pQxJAbMcVuL5CJaAu7ALcwTFLV46VU,2360232
-xmos_ai_tools/xinterpreters/libs/macos/xtflm_python.dylib,sha256=eZfE3gjspfTd_pQxJAbMcVuL5CJaAu7ALcwTFLV46VU,2360232
-xmos_ai_tools-1.3.2.dev303.data/data/bin/xcore-opt,sha256=cLXPnw9BNVaa6FiFwGhA3hyP2fgnz3tjpCY2NYsZxo8,286686248
-xmos_ai_tools-1.3.2.dev303.dist-info/METADATA,sha256=zBSf6f8n8meiAP297aHc-ntSdTiN6kOfAwU-2b9u_hs,1574
-xmos_ai_tools-1.3.2.dev303.dist-info/WHEEL,sha256=I31SmUcoL8b9uce_DevdBj9MUbs81Vi2-7NmWxW2CC0,112
-xmos_ai_tools-1.3.2.dev303.dist-info/top_level.txt,sha256=YWegea73ll3tMlRWRdHJemUy2VOuEYDdOIaffxu_eF0,14
-xmos_ai_tools-1.3.2.dev303.dist-info/RECORD,,
+xmos_ai_tools/xinterpreters/libs/macos/xtflm_python.1.0.1.dylib,sha256=mQp_HoqoSMCxV3Wj1MVVSjtoobePEkDJxgXolJmJsPA,2359560
+xmos_ai_tools/xinterpreters/libs/macos/xtflm_python.dylib,sha256=mQp_HoqoSMCxV3Wj1MVVSjtoobePEkDJxgXolJmJsPA,2359560
+xmos_ai_tools-1.3.2.dev314.data/data/bin/xcore-opt,sha256=F9lfM3nO9moykySibqzSvqf0fR_dl-SOCiumIEa2nVw,286686296
+xmos_ai_tools-1.3.2.dev314.dist-info/METADATA,sha256=4PARxhHjjMdc_jnNIG63WgAEbsQ_UfR3ww_QpZllsZ8,1574
+xmos_ai_tools-1.3.2.dev314.dist-info/WHEEL,sha256=98VLpmTXZiW_X2RJ0T4x1A5tW4Utj3RcaNGBZZbavbg,112
+xmos_ai_tools-1.3.2.dev314.dist-info/top_level.txt,sha256=YWegea73ll3tMlRWRdHJemUy2VOuEYDdOIaffxu_eF0,14
+xmos_ai_tools-1.3.2.dev314.dist-info/RECORD,,

{xmos_ai_tools-1.3.2.dev303.dist-info → xmos_ai_tools-1.3.2.dev314.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.1)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: false
 Tag: py3-none-macosx_10_15_universal2